- fixed segfault:

doing
---
  KAboutData about( ... )
  new KInstance( &about );
---
  is a bad idea :-)
  fixed :-)

svn path=/trunk/kdebase/konsole/; revision=49773
wilder-portage
Simon Hausmann 26 years ago
parent 4abdcffc61
commit 74ccff5538
  1. 1
      include/konsole_part.h
  2. 9
      src/konsole_part.C

@ -49,6 +49,7 @@ public:
private:
static KInstance *s_instance;
static KAboutData *s_aboutData;
};
class konsolePart: public KParts::ReadOnlyPart

@ -57,6 +57,7 @@ extern "C"
* We need one static instance of the factory for our C 'main' function
*/
KInstance *konsoleFactory::s_instance = 0L;
KAboutData *konsoleFactory::s_aboutData = 0;
konsoleFactory::konsoleFactory()
{
@ -67,7 +68,11 @@ konsoleFactory::~konsoleFactory()
if (s_instance)
delete s_instance;
if ( s_aboutData )
delete s_aboutData;
s_instance = 0;
s_aboutData = 0;
}
KParts::Part *konsoleFactory::createPart(QWidget *parentWidget, const char *widgetName,
@ -84,8 +89,8 @@ KInstance *konsoleFactory::instance()
{
if ( !s_instance )
{
KAboutData about("konsole", I18N_NOOP("Konsole"), "1.0");
s_instance = new KInstance(&about);
s_aboutData = new KAboutData("konsole", I18N_NOOP("Konsole"), "1.0");
s_instance = new KInstance( s_aboutData );
}
return s_instance;
}

Loading…
Cancel
Save