1 files changed, 9 insertions, 0 deletions

diff --git a/libopie2/opiecore/oglobal.cpp b/libopie2/opiecore/oglobal.cpp
index ea02058..2968a7d 100644
--- a/libopie2/opiecore/oglobal.cpp
+++ b/libopie2/opiecore/oglobal.cpp
@@ -55,53 +55,62 @@ static const char Base64EncMap[64] =
 static char Base64DecMap[128] =
 {
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x3E, 0x00, 0x00, 0x00, 0x3F,
   0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B,
   0x3C, 0x3D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06,
   0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E,
   0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16,
   0x17, 0x18, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20,
   0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28,
   0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30,
   0x31, 0x32, 0x33, 0x00, 0x00, 0x00, 0x00, 0x00
 };
 
 
 OConfig* OGlobal::_config = 0;
 OConfig* OGlobal::_qpe_config = 0;
 
+void OGlobal::clean_up() {
+    qWarning( "Oglobal clean up" );
+    delete OGlobal::_config;
+    delete OGlobal::_qpe_config;
+    OGlobal::_config = 0;
+    OGlobal::_qpe_config = 0;
+}
+
 OConfig* OGlobal::config()
 {
     if ( !OGlobal::_config )
     {
         // odebug classes are reading config, so can't use them here!
+        qAddPostRoutine( OGlobal::clean_up );
         qDebug( "OGlobal::creating global configuration instance." );
         OGlobal::_config = new OConfig( "global" );
     }
     return OGlobal::_config;
 }
 
 
 /**
  * Return the internal builtin Global::Command object
  *
  */
 Global::Command* OGlobal::builtinCommands() {
     return builtin;
 }
 
 
 /**
  * Return the internal builtin QGuardedPtr<QWidget> object
  */
 QGuardedPtr<QWidget>* OGlobal::builtinRunning() {
     return running;
 }