comparison src/scrobbler/xmms_scrobbler.c @ 108:0eb1e99b7748 trunk

[svn] - move prefswin_page_destroy(cfgdlg) to before the plugin logs out of last.fm; otherwise the prefswin_page handle isn't always removed. Reported on IRC by Tim Yamin <plasmaroo -at- gentoo.org>
author nenolod
date Tue, 24 Oct 2006 18:15:53 -0700
parents 3da1b8942b8b
children 03c1ae10bc8d
comparison
equal deleted inserted replaced
107:ef4bc8441d10 108:0eb1e99b7748
99 static void cleanup(void) 99 static void cleanup(void)
100 { 100 {
101 g_free (xmms_scrobbler.description); 101 g_free (xmms_scrobbler.description);
102 xmms_scrobbler.description = NULL; 102 xmms_scrobbler.description = NULL;
103 103
104 prefswin_page_destroy(cfgdlg);
105
104 if (!going) 106 if (!going)
105 return; 107 return;
106 pdebug("about to lock mutex", DEBUG); 108 pdebug("about to lock mutex", DEBUG);
107 g_mutex_lock(m_scrobbler); 109 g_mutex_lock(m_scrobbler);
108 pdebug("locked mutex", DEBUG); 110 pdebug("locked mutex", DEBUG);
110 g_mutex_unlock(m_scrobbler); 112 g_mutex_unlock(m_scrobbler);
111 pdebug("joining threads", DEBUG); 113 pdebug("joining threads", DEBUG);
112 g_thread_join(pt_scrobbler); 114 g_thread_join(pt_scrobbler);
113 115
114 g_thread_join(pt_handshake); 116 g_thread_join(pt_handshake);
115
116 prefswin_page_destroy(cfgdlg);
117 117
118 sc_cleaner(); 118 sc_cleaner();
119 } 119 }
120 120
121 static char ishttp(const char *a) 121 static char ishttp(const char *a)