1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-03-04 02:28:03 +00:00

(trunk, gtk) #5430: periodic update timer in 'Torrent > Set Location...' should be cleared immediately when dialog is closed.

This commit is contained in:
Jordan Lee 2013-07-20 15:55:29 +00:00
parent fe79ad39bc
commit 2d6ace29ba

View file

@ -28,6 +28,7 @@ struct relocate_dialog_data
{ {
int done; int done;
bool do_move; bool do_move;
guint timer;
TrCore * core; TrCore * core;
GSList * torrent_ids; GSList * torrent_ids;
GtkWidget * message_dialog; GtkWidget * message_dialog;
@ -38,6 +39,7 @@ static void
data_free (gpointer gdata) data_free (gpointer gdata)
{ {
struct relocate_dialog_data * data = gdata; struct relocate_dialog_data * data = gdata;
g_source_remove (data->timer);
g_slist_free (data->torrent_ids); g_slist_free (data->torrent_ids);
g_free (data); g_free (data);
} }
@ -127,8 +129,8 @@ onResponse (GtkDialog * dialog, int response, gpointer unused UNUSED)
/* start the move and periodically check its status */ /* start the move and periodically check its status */
data->message_dialog = w; data->message_dialog = w;
data->done = TR_LOC_DONE; data->done = TR_LOC_DONE;
data->timer = gdk_threads_add_timeout_seconds (1, onTimer, data);
onTimer (data); onTimer (data);
gdk_threads_add_timeout_seconds (1, onTimer, data);
} }
else else
{ {