applied_patches/0673-sfx2-qstart-nocrashhack.diff

   1 diff -ru sfx2/source/appl/shutdownicon.cxx sfx2/source/appl/shutdownicon.cxx
   2 --- sfx2.orig/source/appl/shutdownicon.cxx      2009-04-21 12:57:08.000000000 +0100
   3 +++ sfx2/source/appl/shutdownicon.cxx   2009-04-21 15:26:25.000000000 +0100
   4 @@ -192,7 +192,9 @@
   5                 return;
   6         m_bInitialized = true;
   7
   8 -       (void) LoadModule( &m_pPlugin, &m_pInitSystray, &m_pDeInitSystray );
   9 +    if (!m_pPlugin)
  10 +           (void) LoadModule( &m_pPlugin, &m_pInitSystray, &m_pDeInitSystray );
  11 +
  12         m_bVeto = true;
  13         m_pInitSystray();
  14  }
  15 @@ -201,15 +203,11 @@
  16  {
  17         if (!m_bInitialized)
  18                 return;
  19 +
  20      if (m_pDeInitSystray)
  21                 m_pDeInitSystray();
  22
  23         m_bVeto = false;
  24 -       m_pInitSystray = 0;
  25 -       m_pDeInitSystray = 0;
  26 -       if (m_pPlugin)
  27 -               delete m_pPlugin;
  28 -       m_pPlugin = 0;
  29      delete m_pFileDlg;
  30         m_pFileDlg = NULL;
  31         m_bInitialized = false;
  32 @@ -233,6 +231,11 @@
  33  ShutdownIcon::~ShutdownIcon()
  34  {
  35         deInitSystray();
  36 +    //Bustage on dlclosing when: no qstarter, start writer, enable, close writer, choose disable/quit
  37 +    //dlclose gets called and pulls .so from under hack-tower
  38 +#ifndef UNX
  39 +       delete m_pPlugin;
  40 +#endif
  41  }
  42
  43  // ---------------------------------------------------------------------------