author | kergoth <kergoth> | 2003-03-26 23:55:38 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-03-26 23:55:38 (UTC) |
commit | d57d83e0cda09c34dc92dfedb841a979b767e504 (patch) (unidiff) | |
tree | 4eaf57168e956228a3039ce50eca6f7595ade7f7 | |
parent | 9d291e88efa5b33bbf34112cdee8b0e516150dd6 (diff) | |
download | opie-d57d83e0cda09c34dc92dfedb841a979b767e504.zip opie-d57d83e0cda09c34dc92dfedb841a979b767e504.tar.gz opie-d57d83e0cda09c34dc92dfedb841a979b767e504.tar.bz2 |
BUGFIX: as pointed out by robert, dont fsck with QWS_DISPLAY if it was already set.
-rw-r--r-- | core/launcher/main.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp index fa4df3c..a6e2a9d 100644 --- a/core/launcher/main.cpp +++ b/core/launcher/main.cpp | |||
@@ -79,15 +79,15 @@ void initEnvironment() | |||
79 | * 3. use physical orientation (currently fails due to ODevice | 79 | * 3. use physical orientation (currently fails due to ODevice |
80 | * using a QPixmap and therefore requiring a QApplication) | 80 | * using a QPixmap and therefore requiring a QApplication) |
81 | */ | 81 | */ |
82 | if ( ( rot = QPEApplication::defaultRotation ( ) ) == 0 ) { | 82 | if ( getenv("QWS_DISPLAY") == NULL ) { |
83 | Config config("qpe"); | 83 | Config config("qpe"); |
84 | config.setGroup( "Rotation" ); | 84 | config.setGroup( "Rotation" ); |
85 | if ( ( rot = config.readNumEntry( "Rot", -1 ) ) == -1 ) | 85 | if ( ( rot = config.readNumEntry( "Rot", -1 ) ) == -1 ) |
86 | rot = ODevice::inst ( )-> rotation ( ) * 90; | 86 | rot = ODevice::inst ( )-> rotation ( ) * 90; |
87 | } | ||
88 | 87 | ||
89 | setenv("QWS_DISPLAY", QString("Transformed:Rot%1:0").arg(rot), 1); | 88 | setenv("QWS_DISPLAY", QString("Transformed:Rot%1:0").arg(rot), 1); |
90 | QPEApplication::defaultRotation ( ); /* to ensure deforient matches reality */ | 89 | QPEApplication::defaultRotation ( ); /* to ensure deforient matches reality */ |
90 | } | ||
91 | } | 91 | } |
92 | 92 | ||
93 | 93 | ||