]> rtime.felk.cvut.cz Git - sojka/lightdm.git/commitdiff
Fix warning about status timeout
authorRobert Ancell <robert.ancell@canonical.com>
Thu, 14 Jul 2016 02:33:33 +0000 (14:33 +1200)
committerRobert Ancell <robert.ancell@canonical.com>
Thu, 14 Jul 2016 02:33:33 +0000 (14:33 +1200)
tests/src/test-runner.c

index 1cc6962bc13b7c49cf93e5da5f0bc493bd63351f..018007046f71256aaa1d644c3ca82e3d70fbe86c 100644 (file)
@@ -529,6 +529,7 @@ handle_command (const gchar *command)
         /* Stop status timeout */
         if (status_timeout)
             g_source_remove (status_timeout);
+        status_timeout = 0;
 
         /* Use a main loop so that our DBus functions are still responsive */
         GMainLoop *loop = g_main_loop_new (NULL, FALSE);
@@ -1042,10 +1043,12 @@ status_timeout_cb (gpointer data)
 {
     ScriptLine *line;
 
+    status_timeout = 0;
+
     line = get_script_line (NULL);
     fail ("(timeout)", line ? line->text : NULL);
 
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 static void