From 4646518bdb637ea7eba5061b987604a30bd6cecf Mon Sep 17 00:00:00 2001
From: dmeltzer <dmeltzer@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sun, 2 Dec 2007 03:54:25 +0000
Subject: [PATCH] Disable loading previous playlist on startup for now, it
 causes a bunch of mess due to the collection not being created at the time,
 and is causing an infinite loop in PlaylistGraphicsItem::resize() somehow

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/extragear/multimedia/amarok@743845 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 src/app.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/app.cpp b/src/app.cpp
index ecf2e0a02..5808093d5 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -695,10 +695,12 @@ App::continueInit()
     initGlobalShortcuts();
 #endif
     //load previous playlist in separate thread
-    if ( restoreSession && AmarokConfig::savePlaylist() )
-    {
-        The::playlistModel()->restoreSession();
-    }
+    //FIXME: causes a lot of breakage due to the collection not being properly initialized at startup.
+    //Reenable when fixed.
+//     if ( restoreSession && AmarokConfig::savePlaylist() )
+//     {
+//         The::playlistModel()->restoreSession();
+//     }
     if( args->isSet( "engine" ) ) {
         // we correct some common errors (case issues, missing -engine off the end)
         QString engine = args->getOption( "engine" ).toLower();
@@ -714,8 +716,6 @@ App::continueInit()
     // Start ScriptManager. Must be created _after_ MainWindow.
     ScriptManager::instance();
     Debug::stamp();
-    //notify loader application that we have started
-    std::cout << "STARTUP\n" << std::flush;
 
     //do after applySettings(), or the OSD will flicker and other wierdness!
     //do before restoreSession()!
-- 
2.11.4.GIT