summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-03-26 23:55:38 (UTC)
committer kergoth <kergoth>2003-03-26 23:55:38 (UTC)
commitd57d83e0cda09c34dc92dfedb841a979b767e504 (patch) (side-by-side diff)
tree4eaf57168e956228a3039ce50eca6f7595ade7f7
parent9d291e88efa5b33bbf34112cdee8b0e516150dd6 (diff)
downloadopie-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.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/main.cpp8
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
@@ -66,41 +66,41 @@ void initEnvironment()
config.setGroup( "Language" );
QString lang = config.readEntry( "Language", getenv("LANG") );
if ( !lang.isNull() )
setenv( "LANG", lang, 1 );
#if !defined(QT_QWS_CASSIOPEIA) && !defined(QT_QWS_IPAQ) && !defined(QT_QWS_SL5XXX)
setenv( "QWS_SIZE", "240x320", 0 );
#endif
/*
* Rotation:
* 1. use env var if set
* 2. use saved default if set
* 3. use physical orientation (currently fails due to ODevice
* using a QPixmap and therefore requiring a QApplication)
*/
- if ( ( rot = QPEApplication::defaultRotation ( ) ) == 0 ) {
+ if ( getenv("QWS_DISPLAY") == NULL ) {
Config config("qpe");
config.setGroup( "Rotation" );
if ( ( rot = config.readNumEntry( "Rot", -1 ) ) == -1 )
rot = ODevice::inst ( )-> rotation ( ) * 90;
- }
- setenv("QWS_DISPLAY", QString("Transformed:Rot%1:0").arg(rot), 1);
- QPEApplication::defaultRotation ( ); /* to ensure deforient matches reality */
+ setenv("QWS_DISPLAY", QString("Transformed:Rot%1:0").arg(rot), 1);
+ QPEApplication::defaultRotation ( ); /* to ensure deforient matches reality */
+ }
}
int initApplication( int argc, char ** argv )
{
initEnvironment();
//Don't flicker at startup:
QWSServer::setDesktopBackground( QImage() );
DesktopApplication a( argc, argv, QApplication::GuiServer );
ODevice::inst ( )-> setSoftSuspend ( true );
{ // init backlight
QCopEnvelope e("QPE/System", "setBacklight(int)" );