[vlmc-devel] commit: Import: Fixed crash when loading a directory containing at least one directory. ( Hugo Beauzée-Luyssen )

git at videolan.org git at videolan.org
Thu Apr 15 18:49:46 CEST 2010


vlmc | branch: master | Hugo Beauzée-Luyssen <beauze.h at gmail.com> | Thu Apr 15 18:48:34 2010 +0200| [853aebaca20fa6c6a7e9cf75931eaa4ac7833015] | committer: Hugo Beauzée-Luyssen 

Import: Fixed crash when loading a directory containing at least one directory.

Fixes #63
Also removed a forgotten debug output.

> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=853aebaca20fa6c6a7e9cf75931eaa4ac7833015
---

 src/Gui/import/ImportController.cpp |    2 +-
 src/Workflow/TrackWorkflow.cpp      |    1 -
 2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/Gui/import/ImportController.cpp b/src/Gui/import/ImportController.cpp
index 03d7c0b..c558f3d 100644
--- a/src/Gui/import/ImportController.cpp
+++ b/src/Gui/import/ImportController.cpp
@@ -200,7 +200,7 @@ ImportController::importDir( const QString &path )
     foreach ( QFileInfo fInfo, files )
     {
         if ( fInfo.isDir() == true )
-            importDir( fInfo.absolutePath() );
+            importDir( fInfo.absoluteFilePath() );
         else
         {
             QString ext = fInfo.suffix();
diff --git a/src/Workflow/TrackWorkflow.cpp b/src/Workflow/TrackWorkflow.cpp
index 24a5b8d..47db6d5 100644
--- a/src/Workflow/TrackWorkflow.cpp
+++ b/src/Workflow/TrackWorkflow.cpp
@@ -359,7 +359,6 @@ Clip*       TrackWorkflow::removeClip( const QUuid& id )
             computeLength();
             cw->disconnect();
             delete cw;
-            qDebug() << "Deleted clipworkflow";
             if ( m_length == 0 )
                 emit trackEndReached( m_trackId );
             return clip;



More information about the Vlmc-devel mailing list