1 files changed, 11 insertions, 14 deletions

diff --git a/core/launcher/libpreload/preload.cpp b/core/launcher/libpreload/preload.cpp
index 4505428..10d8313 100644
--- a/core/launcher/libpreload/preload.cpp
+++ b/core/launcher/libpreload/preload.cpp
@@ -7,2 +7,3 @@
 #include <qcommonstyle.h>
+
 //#include <qapplication.h>
@@ -22,3 +23,3 @@ class QFont;
 typedef void ( *qapp_setstyle_t ) ( QStyle * );
-typedef void ( *qapp_setdeco_t ) ( QApplication *, QWSDecoration * ); 
+typedef void ( *qapp_setdeco_t ) ( QWSDecoration * ); 
 typedef void ( *qapp_setfont_t ) ( const QFont &, bool, const char * ); 
@@ -26,3 +27,3 @@ typedef void ( *qapp_setfont_t ) ( const QFont &, bool, const char * );
 
-static bool *opie_block_style_p = 0;
+static int *opie_block_style_p = 0;
 
@@ -48,8 +49,6 @@ extern void setStyle__12QApplicationP6QStyle ( QStyle *style )
         if ( !opie_block_style_p )
-                opie_block_style_p = (bool *) resolve_symbol ( "opie_block_style" );
+                opie_block_style_p = (int *) resolve_symbol ( "opie_block_style" );
         
-        if ( !qsetstyle || ( opie_block_style_p && *opie_block_style_p )) {
+        if ( !qsetstyle || ( opie_block_style_p && ( *opie_block_style_p & 0x01 )))
                 delete style;
-                return;
-        }
         else
@@ -66,5 +65,5 @@ extern void setFont__12QApplicationRC5QFontbPCc ( const QFont &fnt, bool informW
         if ( !opie_block_style_p )
-                opie_block_style_p = (bool *) resolve_symbol ( "opie_block_style" );
+                opie_block_style_p = (int *) resolve_symbol ( "opie_block_style" );
         
-        if ( qsetfont && !( opie_block_style_p && *opie_block_style_p ))
+        if ( qsetfont && !( opie_block_style_p && ( *opie_block_style_p & 0x02 )))
                 ( *qsetfont ) ( fnt, informWidgets, className );
@@ -73,3 +72,3 @@ extern void setFont__12QApplicationRC5QFontbPCc ( const QFont &fnt, bool informW
 
-extern void qwsSetDecoration__12QApplicationP13QWSDecoration ( QApplication *app, QWSDecoration *deco )
+extern void qwsSetDecoration__12QApplicationP13QWSDecoration ( QWSDecoration *deco )
 {
@@ -81,10 +80,8 @@ extern void qwsSetDecoration__12QApplicationP13QWSDecoration ( QApplication *app
         if ( !opie_block_style_p )
-                opie_block_style_p = (bool *) resolve_symbol ( "opie_block_style" );
+                opie_block_style_p = (int *) resolve_symbol ( "opie_block_style" );
         
-        if ( !qsetdeco || ( opie_block_style_p && *opie_block_style_p )) {
+        if ( !qsetdeco || ( opie_block_style_p && ( *opie_block_style_p & 0x04 )))
                 delete deco;
-                return;
-        }
         else
-                ( *qsetdeco ) ( app, deco );
+                ( *qsetdeco ) ( deco );
 }