fix a crash when enabling/disabling status icon and a fix for the new GtkApplication impl

1 files changed, 6 insertions, 3 deletions

diff --git a/src/main.c b/src/main.c
index 1bd21c4..5e521ad 100644
--- a/src/main.c
+++ b/src/main.c
@@ -130,7 +130,8 @@ static gint trg_libunique_init(TrgClient * client, int argc,
         g_signal_connect(app, "message-received",
                          G_CALLBACK(message_received_cb), window);
 
-        auto_connect_if_required(window, args);
+        trg_main_window_set_start_args(window, args);
+        auto_connect_if_required(window);
         gtk_main();
     }
 
@@ -163,7 +164,8 @@ static gint trg_simple_init(TrgClient * client, int argc, char *argv[],
 {
     TrgMainWindow *window =
         trg_main_window_new(client, should_be_minimised(argc, argv));
-    auto_connect_if_required(window, args);
+    trg_main_window_set_start_args(window, args);
+    auto_connect_if_required(window);
     gtk_main();
 
     return EXIT_SUCCESS;
@@ -191,7 +193,8 @@ static gint trg_win32_init(TrgClient * client, int argc, char *argv[],
     if (!mailslot_send_message(args)) {
         TrgMainWindow *window =
             trg_main_window_new(client, should_be_minimised(argc, argv));
-        auto_connect_if_required(window, args);
+        trg_main_window_set_start_args(window, args);
+        auto_connect_if_required(window);
         mailslot_start_background_listener(window);
         gtk_main();
     }