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 71bd3c259272…

Parents 53031f2c8b6c…

Parents 90dfe94db0a5…

by Adrian Buehlmann

Changes to one file · Browse files at 71bd3c259272 Showing diff from parent 53031f2c8b6c 90dfe94db0a5 Diff from another changeset...

Change 1 of 1 Show Entire File win32/​shellext/​CShellExtCMenu.cpp Stacked
 
856
857
858
859
860
861
862
 
 
 
 
 
863
864
865
 
856
857
858
 
 
 
 
859
860
861
862
863
864
865
866
@@ -856,10 +856,11 @@
    if (cmd == "thgstatus")   { - std::string p = dir + "\\TortoiseHgOverlayServer.exe"; - LaunchCommand(Quote(p), cwd); - - Thgstatus::remove(cwd); + if (Thgstatus::remove(cwd) != 0) + { + std::string p = dir + "\\TortoiseHgOverlayServer.exe"; + LaunchCommand(Quote(p), cwd); + }   InitStatus::check();   return;   }