gircore · badcel · Sep 20, 2023 · Sep 16, 2023 · Sep 18, 2023
diff --git a/src/Libs/Gio-2.0/Public/Application.cs b/src/Libs/Gio-2.0/Public/Application.cs
@@ -1,4 +1,5 @@
-using System.Threading;
+using System;
+using System.Threading;
 
 namespace Gio;
 
@@ -9,20 +10,19 @@ static Application()
         Module.Initialize();
     }
 
-    public int Run()
-    {
-        return Internal.Application.Run(Handle, 0, new string[0]);
-    }
-
-    public int RunWithSynchronizationContext()
+    public int RunWithSynchronizationContext(string[]? args)
     {
         var original = SynchronizationContext.Current;
 
         SynchronizationContext.SetSynchronizationContext(new GLib.Internal.MainLoopSynchronizationContext());
 
         try
         {
-            return Run();
+            if (args == null)
+            {
+                return Run(0, Array.Empty<string>());
+            }
+            return Run(args.Length, args);
         }
         finally
         {

diff --git a/src/Samples/Adw-1/Window/Program.cs b/src/Samples/Adw-1/Window/Program.cs
@@ -8,4 +8,4 @@
     window.SetChild(label);
     window.Show();
 };
-return application.Run();
+return application.RunWithSynchronizationContext(null);
diff --git a/src/Samples/Gtk-4.0/AboutDialog/Program.cs b/src/Samples/Gtk-4.0/AboutDialog/Program.cs
@@ -6,4 +6,4 @@
     dialog.Show();
 };
 
-return application.Run();
+return application.RunWithSynchronizationContext(null);
diff --git a/src/Samples/Gtk-4.0/Builder/Program.cs b/src/Samples/Gtk-4.0/Builder/Program.cs
@@ -7,4 +7,4 @@
     dialog.OnResponse += (_, _) => application.Quit();
 };
 
-return application.Run();
+return application.RunWithSynchronizationContext(null);
diff --git a/src/Samples/Gtk-4.0/DrawingArea/DrawingArea.cs b/src/Samples/Gtk-4.0/DrawingArea/DrawingArea.cs
@@ -19,4 +19,4 @@ void Draw(Gtk.DrawingArea drawingArea, Cairo.Context cr, int width, int height)
     cr.MoveTo(40, 60);
     cr.ShowText("Powered by gir.core - GObject bindings for .NET");
 }
-return application.Run();
+return application.RunWithSynchronizationContext(null);
diff --git a/src/Samples/Gtk-4.0/Window/Program.cs b/src/Samples/Gtk-4.0/Window/Program.cs
@@ -6,4 +6,4 @@
     window.SetDefaultSize(300, 300);
     window.Show();
 };
-return application.Run();
+return application.RunWithSynchronizationContext(null);
diff --git a/src/Samples/GtkSource-5/GtkSourceView/Program.cs b/src/Samples/GtkSource-5/GtkSourceView/Program.cs
@@ -16,4 +16,4 @@
     window.Child = view;
     window.Show();
 };
-return application.Run();
+return application.RunWithSynchronizationContext(null);
diff --git a/src/Samples/WebKit-6.0/JavascriptCall/Program.cs b/src/Samples/WebKit-6.0/JavascriptCall/Program.cs
@@ -41,6 +41,6 @@
     window.SetChild(webView);
     window.Show();
 };
-return application.Run();
+return application.RunWithSynchronizationContext(null);
 
 #pragma warning restore CA1416
diff --git a/src/Samples/WebKit-6.0/JavascriptCallback/Program.cs b/src/Samples/WebKit-6.0/JavascriptCallback/Program.cs
@@ -50,6 +50,6 @@
     window.SetChild(webView);
     window.Present();
 };
-return application.Run();
+return application.RunWithSynchronizationContext(null);
 
 #pragma warning restore CA1416