Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1, 1.1.1, and 1.1.2

Merge with stable

Changeset c95b8caa2806

Parents d2592647454a

Parents ca30f8795605

by Adrian Buehlmann

Changes to one file · Browse files at c95b8caa2806 Showing diff from parent d2592647454a ca30f8795605 Diff from another changeset...

 
6
7
8
9
 
 
 
 
 
 
10
11
 
6
7
8
 
9
10
11
12
13
14
15
16
@@ -6,6 +6,11 @@
   int main(int argc, char *argv[])  { - Thgstatus::terminate(); + if (Thgstatus::terminate() == 0) + { + // pipe ok, so icon server is running + // -> wait a bit for icon server to shut down + ::Sleep(5000 /* ms */); + }   return 0;  }