[Kde-imaging] extragear/graphics/kipi-plugins

[Valerio Fuoglio]

SVN commit 868547 by vfuoglio:

Fixed crash.

BUG: 172283
CCMAIL: kde-imaging at kde.org



 M  +4 -0      NEWS  
 M  +17 -4     slideshow/common.cpp  
 M  +3 -9      slideshow/plugin_slideshow.cpp  


--- trunk/extragear/graphics/kipi-plugins/NEWS #868546:868547
@@ -1,6 +1,10 @@
 v 0.2.0 - beta3
 ------------------------------------------------------------------------
 
+Kipi-plugins BUG FIXING from B.K.O (http://bugs.kde.org):
+
+001 ==> 172283 : SlideShow          : SlideShow crashes host application 
+
 v 0.2.0 - beta2
 ------------------------------------------------------------------------
 
--- trunk/extragear/graphics/kipi-plugins/slideshow/common.cpp #868546:868547
@@ -37,6 +37,7 @@
     mainPage = 0;
     captionPage = 0;
     advancedPage = 0;
+    soundtrackPage = 0;
 
     opengl = false;
     delay = 0;
@@ -60,14 +61,26 @@
     kbDisableFadeInOut = false;
     kbDisableCrossFade = false;
     cacheSize = 0;
+
+    page_main = 0;
+    page_caption = 0;
+    page_soundtrack = 0;
+    page_advanced = 0;
 }
 
 SharedData::~SharedData() 
 {
-    delete page_main;
-    delete page_caption; 
-    delete page_soundtrack;
-    delete page_advanced;
+    if ( mainPage ) delete mainPage;
+    if ( captionPage ) delete captionPage;
+    if ( soundtrackPage ) delete soundtrackPage;
+    if ( advancedPage ) delete advancedPage;
+
+    if ( page_main ) delete page_main;
+    if ( page_caption ) delete page_caption;
+    if ( page_soundtrack ) delete page_soundtrack;
+    if ( page_advanced ) delete page_advanced;
+
+    if ( captionFont ) delete captionFont;
 }
 
 
--- trunk/extragear/graphics/kipi-plugins/slideshow/plugin_slideshow.cpp #868546:868547
@@ -76,6 +76,8 @@
 
     kDebug( 51001 ) << "Plugin_SlideShow plugin loaded"
     << endl;
+
+    m_sharedData = 0;
 }
 
 void Plugin_SlideShow::setup( QWidget* widget )
@@ -102,18 +104,11 @@
             this, SLOT( slotAlbumChanged( bool )));
 
     addAction( m_actionSlideShow );
+
 }
 
 Plugin_SlideShow::~Plugin_SlideShow()
 {
-    if ( m_sharedData )
-    {
-        delete m_sharedData->mainPage;
-        delete m_sharedData->captionPage;
-        delete m_sharedData->advancedPage;
-        delete m_sharedData->soundtrackPage;
-    }
-
     if (m_urlList)
         delete m_urlList;
 }
@@ -126,7 +121,6 @@
         return;
     }
 
-
     m_sharedData = new KIPISlideShowPlugin::SharedData();
 
     m_sharedData->showSelectedFilesOnly = true;