[totem/wip/hadess/bug-fixes: 2/4] main: Remove "exit thread" work-around
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [totem/wip/hadess/bug-fixes: 2/4] main: Remove "exit thread" work-around
- Date: Thu, 7 Feb 2019 17:57:14 +0000 (UTC)
commit d63ff0f4cd4fb14e5ec3391fdabe84a3448ed861
Author: Bastien Nocera <hadess hadess net>
Date: Thu Feb 7 18:18:00 2019 +0100
main: Remove "exit thread" work-around
That can't really ever have worked, as calling exit() in the non-main
thread caused crashes.
Closes: #227
src/totem-object.c | 11 -----------
1 file changed, 11 deletions(-)
---
diff --git a/src/totem-object.c b/src/totem-object.c
index 108c16cd8..5126fea9f 100644
--- a/src/totem-object.c
+++ b/src/totem-object.c
@@ -41,7 +41,6 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
-#include <stdlib.h>
#include <math.h>
#include <gio/gio.h>
#include <libgd/gd.h>
@@ -1301,13 +1300,6 @@ totem_object_save_state (TotemObject *totem)
g_free (contents);
}
-G_GNUC_NORETURN static void
-totem_object_wait_force_exit (gpointer user_data)
-{
- g_usleep (10 * G_USEC_PER_SEC);
- exit (1);
-}
-
/**
* totem_object_exit:
* @totem: a #TotemObject
@@ -1323,9 +1315,6 @@ totem_object_exit (TotemObject *totem)
if (totem != NULL && totem->engine != NULL)
totem_object_plugins_shutdown (totem);
- /* Exit forcefully if we can't do the shutdown in 10 seconds */
- g_thread_new ("force-exit", (GThreadFunc) totem_object_wait_force_exit, NULL);
-
if (gtk_main_level () > 0)
gtk_main_quit ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]