aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2012-06-18 05:18:31 +0000
committerhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2012-06-18 05:18:31 +0000
commit816804b9165a9a4d488440cad681a22b6dd7d34e (patch)
tree92a8ff3582835ccb6f8b1f28792d05415c02d050
parent3d623ee5810a747e4f23e5dffb89bcea8e628075 (diff)
nsis/update-manager.nsi: prevent 'Sylpheed is running.' message on update.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@3098 ee746299-78ed-0310-b773-934348b2243d
-rw-r--r--ChangeLog5
-rw-r--r--nsis/update-manager.nsi13
2 files changed, 18 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d50ce8c1..9ddc0b94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2012-06-18
+ * nsis/update-manager.nsi: prevent 'Sylpheed is running.' message
+ on update.
+
+2012-06-18
+
* src/mimeview.c: mimeview_destroy(): fixed a memory leak of a
GtkItemFactory.
diff --git a/nsis/update-manager.nsi b/nsis/update-manager.nsi
index e31ab3ad..f79a8a60 100644
--- a/nsis/update-manager.nsi
+++ b/nsis/update-manager.nsi
@@ -103,6 +103,19 @@ Section "Exec Installer"
Abort
ExecWait "$INSTDIR\sylpheed.exe --exit" $R0
+
+ ; Wait for sylpheed.exe quit completely
+ ${nsProcess::FindProcess} "sylpheed.exe" $R0
+ StrCmp $R0 "0" 0 wait_done
+ Sleep 1000
+ ${nsProcess::FindProcess} "sylpheed.exe" $R0
+ StrCmp $R0 "0" 0 wait_done
+ Sleep 1000
+ ${nsProcess::FindProcess} "sylpheed.exe" $R0
+ StrCmp $R0 "0" 0 wait_done
+ Sleep 1000
+
+ wait_done:
ExecWait '"${TEMP_INSTALLER_PATH}" /S' $0
SectionEnd