• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision5294 (tree)
Zeit2005-12-30 01:36:36
Autorstefankueng

Log Message

OnOpenFiles() already calls LoadViews(), so don't call it again.

Ändern Zusammenfassung

Diff

--- trunk/src/TortoiseMerge/TortoiseMerge.cpp (revision 5293)
+++ trunk/src/TortoiseMerge/TortoiseMerge.cpp (revision 5294)
@@ -260,6 +260,7 @@
260260 if (!pFrame->m_Data.IsBaseFileInUse() && pFrame->m_Data.m_sPatchPath.IsEmpty() && pFrame->m_Data.m_sDiffFile.IsEmpty())
261261 {
262262 pFrame->OnFileOpen();
263+ return TRUE;
263264 }
264265 return pFrame->LoadViews();
265266 }
Show on old repository browser