summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2016-07-14 14:33:33 +1200
committerRobert Ancell <robert.ancell@canonical.com>2016-07-14 14:33:33 +1200
commitd39b292b3d3e77bccfb8300d91e5bdacda00c836 (patch)
tree5a28cf00c1f8bfd71932d277bd0cc6bde95dc4f3
parentf08c959e0b3a3eb5fbc64f3cd27058df61453605 (diff)
downloadlightdm-git-d39b292b3d3e77bccfb8300d91e5bdacda00c836.tar.gz
Fix warning about status timeout
-rw-r--r--tests/src/test-runner.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/src/test-runner.c b/tests/src/test-runner.c
index 1cc6962b..01800704 100644
--- a/tests/src/test-runner.c
+++ b/tests/src/test-runner.c
@@ -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