[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [Amarok] 44bc873: Calling KDirLister::openUrl() with an empty/invali
From:       Jakub Wieczorek <faw217 () gmail ! com>
Date:       2010-02-27 18:33:05
Message-ID: 201002271833.o1RIX5iV025755 () kore ! kollide ! net
[Download RAW message or body]

commit 44bc8737b0c9efe6f5b72386de10fcc36d152c7b
Author: Jakub Wieczorek <faw217@gmail.com>
Date:   Sat Feb 27 20:09:57 2010 +0100

    Calling KDirLister::openUrl() with an empty/invalid URL would show a
    message box on the startup. This can happen when the configuration for
    Amarok does not exist yet.

diff --git a/src/browsers/filebrowser/FileBrowser.cpp \
b/src/browsers/filebrowser/FileBrowser.cpp index 5791168..7f59947 100644
--- a/src/browsers/filebrowser/FileBrowser.cpp
+++ b/src/browsers/filebrowser/FileBrowser.cpp
@@ -46,7 +46,6 @@ FileBrowser::FileBrowser( const char * name, QWidget *parent )
     connect( &m_filterTimer, SIGNAL( timeout() ), this, SLOT( slotFilterNow() ) );
 
     m_kdirModel = new KDirModel( this );
-    m_kdirModel->dirLister()->openUrl( KUrl( QDir::homePath() ) );
 
     m_mimeFilterProxyModel = new MimeTypeFilterProxyModel( \
EngineController::supportedMimeTypes(), this );  \
m_mimeFilterProxyModel->setSourceModel( m_kdirModel ); @@ -173,8 +172,9 @@ void \
FileBrowser::readConfig()  
     KConfigGroup config = Amarok::config( "File Browser" );
 
-    m_kdirModel->dirLister()->openUrl( KUrl( config.readEntry( "Current Directory" ) \
                ) );
-    m_currentPath = KUrl( config.readEntry( "Current Directory" ) ).path();
+    KUrl currentDirectory = config.readEntry( "Current Directory", QDir::homePath() \
); +    m_kdirModel->dirLister()->openUrl( currentDirectory );
+    m_currentPath = currentDirectory.path();
 
     QFile file( Amarok::saveLocation() + "file_browser_layout" );
     QByteArray layout;


[prev in list] [next in list] [prev in thread] [next in thread]