author | eilers <eilers> | 2003-08-08 14:45:49 (UTC) |
---|---|---|
committer | eilers <eilers> | 2003-08-08 14:45:49 (UTC) |
commit | 14d394e6c107b037a09a31a92605034fe50f7813 (patch) (unidiff) | |
tree | 800699cf4dc9681c3eb023340634dd6a15fd04c8 /library/config.cpp | |
parent | dbc6ea35f5535a1f69deb7ebbafc0f721721dbf2 (diff) | |
download | opie-14d394e6c107b037a09a31a92605034fe50f7813.zip opie-14d394e6c107b037a09a31a92605034fe50f7813.tar.gz opie-14d394e6c107b037a09a31a92605034fe50f7813.tar.bz2 |
Merged branches from BRANCH_1_0
-rw-r--r-- | library/config.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/library/config.cpp b/library/config.cpp index b47c620..b28c771 100644 --- a/library/config.cpp +++ b/library/config.cpp | |||
@@ -521,6 +521,16 @@ void Config::read() | |||
521 | return; | 521 | return; |
522 | } | 522 | } |
523 | 523 | ||
524 | |||
525 | // hack to avoid problems if big files are passed to test | ||
526 | // if they are valid configs ( like passing a mp3 ... ) | ||
527 | // I just hope that there are no conf files > 100000 byte | ||
528 | // not the best solution, find something else later | ||
529 | if ( f.size() > 100000 ) { | ||
530 | return; | ||
531 | } | ||
532 | |||
533 | |||
524 | QTextStream s( &f ); | 534 | QTextStream s( &f ); |
525 | #if QT_VERSION <= 230 && defined(QT_NO_CODECS) | 535 | #if QT_VERSION <= 230 && defined(QT_NO_CODECS) |
526 | // The below should work, but doesn't in Qt 2.3.0 | 536 | // The below should work, but doesn't in Qt 2.3.0 |