A hack workaround to prevent the launcher segfaulting after adding/removing

a launcher tab. This only appears to happen if you insert/remove removable media
that contains apps that would insert a tab (like games perhaps). It has a deeper
root cause but for the moment this works around it.

1 files changed, 17 insertions, 2 deletions

diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp
index 779fe54..87a54bf 100644
--- a/core/launcher/launcher.cpp
+++ b/core/launcher/launcher.cpp
@@ -342,2 +342,13 @@ void LauncherTabWidget::setProgressStyle()
 
+/*
+ * FIXME
+ * The following NULL check is triggered by inserting, then removing a tab on the fly
+ * as you would if you had removable media (which I do). Without this check
+ * the first app launched after a tab removal causes qpe to Segfault.
+ * This obviously has a more sinister cause, but this works around it with no
+ * obvious adverse effects. Please FIXME
+ * bkc - 17/6/2004
+ *
+ */
+
 void LauncherTabWidget::setBusy(bool on)
@@ -348,4 +359,8 @@ void LauncherTabWidget::setBusy(bool on)
     for ( int i = 0; i < categoryBar->count(); i++ ) {
-        LauncherView *view = ((LauncherTab *)categoryBar->tab(i))->view;
-        view->setBusy( FALSE );
+	if (categoryBar->tab(i)) {
+	    LauncherView *view = ((LauncherTab *)categoryBar->tab(i))->view;
+	    view->setBusy( FALSE );
+	} else {
+	    odebug << "Averting Disaster with tab " << i << " == NULL! " << oendl;
+	}
     }