diff --git a/kmail.kcfg b/kmail.kcfg index d83adf41c..2bf39b796 100644 --- a/kmail.kcfg +++ b/kmail.kcfg @@ -109,8 +109,9 @@ 0 0 - - + diff --git a/kmmainwidget.cpp b/kmmainwidget.cpp index 2783042e9..40e9f3f93 100644 --- a/kmmainwidget.cpp +++ b/kmmainwidget.cpp @@ -1800,10 +1800,10 @@ void KMMainWidget::folderSelected( KMFolder* aFolder, bool forceJumpToUnread ) mForceJumpToUnread = forceJumpToUnread; // Set a timer to show a splash screen if fetching folder contents - // takes more than a second + // takes more than the amount of seconds configured in the kmailrc (default 1000 msec) mShowBusySplashTimer = new QTimer( this ); connect( mShowBusySplashTimer, SIGNAL( timeout() ), this, SLOT( slotShowBusySplash() ) ); - mShowBusySplashTimer->start( 1000, true ); + mShowBusySplashTimer->start( GlobalSettings::self()->folderLoadingTimeout(), true ); return; } else { // the folder is complete now - so go ahead