[Traverso-commit] traverso/src/core ProjectConverter.cpp

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/10/11 14:36:33

Modified files:
        src/core       : ProjectConverter.cpp 

Log message:
        * exit the FileMerge event loop before starting to wait() on it :) 

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ProjectConverter.cpp?cvsroot=traverso&r1=1.2&r2=1.3

Patches:
Index: ProjectConverter.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/ProjectConverter.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ProjectConverter.cpp        10 Oct 2007 19:45:00 -0000      1.2
+++ ProjectConverter.cpp        11 Oct 2007 14:36:33 -0000      1.3
@@ -252,6 +252,9 @@
                delete source;
        }
        
+       // Exit the FileMerger event loop
+       m_merger->exit(0);      
+       
        if ( ! m_merger->wait(1000) ) {
                qWarning("FileMerger:: Still running after 1 second wait, 
terminating!");
                m_merger->terminate();