Fix various segfaults etc.

eartle · Dec 9, 2010 · 02632eb · 02632eb
1 parent 4907f57
commit 02632eb
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 5 deletions.
diff --git a/admin/genPluginInfo b/admin/genPluginInfo
@@ -36,6 +36,7 @@ cat << EOF
 
     
     GenPluginList( const GenPluginList& that )
+    :QList<IPluginInfo*>()
     {
         *this = that;
     }

diff --git a/app/audioscrobbler/Wizard/BootstrapPage.cpp b/app/audioscrobbler/Wizard/BootstrapPage.cpp
@@ -69,8 +69,6 @@ BootstrapPage::BootstrapPage( QWidget* parent )
 { 
     new QVBoxLayout( this );
 
-    setTitle( tr( "Hi, %1" ).arg( aApp->currentSession()->userInfo().name()));
-
 #ifdef Q_OS_MAC
     QLabel* label = new QLabel( tr( "We recommend importing your listening history from your media player. Please select your prefered option below:")); 
 #else
@@ -91,6 +89,7 @@ BootstrapPage::BootstrapPage( QWidget* parent )
 void 
 BootstrapPage::initializePage()
 {
+    setTitle( tr( "Hi, %1" ).arg( aApp->currentSession()->userInfo().name()));
     m_psl->refresh();
 }
 
diff --git a/app/audioscrobbler/Wizard/WelcomePage.h b/app/audioscrobbler/Wizard/WelcomePage.h
@@ -31,12 +31,14 @@ class WelcomePage : public QWizardPage
     {
 //        QString username = unicorn::Session().userInfo().name();
         QString username = qobject_cast<unicorn::Application*>( qApp )->currentSession()->userInfo().name();
+
+        PluginList list;
         ui.welcomeLabel->setText(
             tr( "<p><strong>Hi %1,<br/>Welcome to the Last.fm Scrobbler</strong>\t\t\t</p>" ).arg( username ) +
             tr( "<p>The Scrobbler tracks what you listen to and updates your Last.fm profile.</p>"
                 "<p>Start listening to some music in %1.</p>"
                 "<p>If you close the Scrobbler, find it again in your menu bar or with Apple Ctrl Shift + S.</p>" )
-            .arg( PluginList().availableDescription() ) );
+            .arg( list.availableDescription() ) );
 
     }
 

diff --git a/plugins/LFMRadio/PluginInfo.h b/plugins/LFMRadio/PluginInfo.h
@@ -28,12 +28,12 @@ class UNICORN_DLLEXPORT LFMRadioPluginInfo : public IPluginInfo
 
     IPluginInfo* clone() const{ return new LFMRadioPluginInfo( *this ); }
 
-   #ifdef QT_VERSION
+    #ifdef QT_VERSION
     QString pluginInstallPath() const
     {
         return QString();
     }
-#endif
+    #endif
 
 };
 

diff --git a/plugins/foobar08/PluginInfo.h b/plugins/foobar08/PluginInfo.h
@@ -38,6 +38,7 @@ class UNICORN_DLLEXPORT FooBar08PluginInfo : public IPluginInfo
         return s.value( "Install Path" ) + "\\components";
     #endif 
         Q_ASSERT( !"There is no windows mediaplayer on non-windows platforms!" );
+        return "";
     }
 #endif
 };

diff --git a/plugins/foobar09/PluginInfo.h b/plugins/foobar09/PluginInfo.h
@@ -37,6 +37,7 @@ class UNICORN_DLLEXPORT FooBar09PluginInfo : public IPluginInfo
         return s.value( "Install Path" ) + "\\components";
     #endif 
         Q_ASSERT( !"There is no windows mediaplayer on non-windows platforms!" );
+        return "";
     }
 #endif
 

diff --git a/plugins/winamp/PluginInfo.h b/plugins/winamp/PluginInfo.h
@@ -37,6 +37,7 @@ class UNICORN_DLLEXPORT WinampPluginInfo : public IPluginInfo
         return s.value( "Path" ) + "\\Plugins";
     #endif 
         Q_ASSERT( !"There is no winamp on non-windows platforms!" );
+        return "";
     }
 #endif
 

diff --git a/plugins/wmp/PluginInfo.h b/plugins/wmp/PluginInfo.h
@@ -37,6 +37,7 @@ class UNICORN_DLLEXPORT WmpPluginInfo : public IPluginInfo
         return s.value( "Path" ) + "\\Plugins";
     #endif 
         Q_ASSERT( !"There is no windows mediaplayer on non-windows platforms!" );
+        return "";
     }
 #endif
 };