[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r3529: Backport r3528. (in vidalia/branches/vidalia-0.1: . src/vidalia)
Author: edmanm
Date: 2009-02-16 19:59:05 -0500 (Mon, 16 Feb 2009)
New Revision: 3529
Modified:
vidalia/branches/vidalia-0.1/
vidalia/branches/vidalia-0.1/src/vidalia/mainwindow.cpp
Log:
Backport r3528.
Property changes on: vidalia/branches/vidalia-0.1
___________________________________________________________________
Modified: svn:mergeinfo
- /vidalia/trunk:3482,3504-3505,3524-3526
+ /vidalia/trunk:3482,3504-3505,3524-3526,3528
Modified: vidalia/branches/vidalia-0.1/src/vidalia/mainwindow.cpp
===================================================================
--- vidalia/branches/vidalia-0.1/src/vidalia/mainwindow.cpp 2009-02-17 00:57:51 UTC (rev 3528)
+++ vidalia/branches/vidalia-0.1/src/vidalia/mainwindow.cpp 2009-02-17 00:59:05 UTC (rev 3529)
@@ -285,8 +285,10 @@
if (_browserProcess->state() == QProcess::Running)
_browserProcess->terminate();
+#if defined(Q_OS_WIN)
/* Kill any processes which might have been forked off */
win32_end_process_by_filename(vidalia_settings.getBrowserExecutable());
+#endif
if (_imProcess->state() == QProcess::Running)
_imProcess->terminate();