equal
deleted
inserted
replaced
184 .arg(HWApplication::tr("Custom path to the game data folder", "command-line")) |
184 .arg(HWApplication::tr("Custom path to the game data folder", "command-line")) |
185 .arg(HWApplication::tr("Hedgewars can use a %1 (e.g. \"%2\") to connect on start.", "command-line").arg(HWApplication::tr("CONNECTSTRING", "command-line")).arg(QString("hwplay://") + NETGAME_DEFAULT_SERVER)); |
185 .arg(HWApplication::tr("Hedgewars can use a %1 (e.g. \"%2\") to connect on start.", "command-line").arg(HWApplication::tr("CONNECTSTRING", "command-line")).arg(QString("hwplay://") + NETGAME_DEFAULT_SERVER)); |
186 } |
186 } |
187 |
187 |
188 int main(int argc, char *argv[]) { |
188 int main(int argc, char *argv[]) { |
|
189 cfgdir->setPath(QDir::homePath()); |
189 |
190 |
190 // Since we're calling this first, closeResources() will be the last thing called after main() returns. |
191 // Since we're calling this first, closeResources() will be the last thing called after main() returns. |
191 atexit(closeResources); |
192 atexit(closeResources); |
192 |
193 |
193 #ifdef __APPLE__ |
194 #ifdef __APPLE__ |
276 cfgdir->setPath(f.absoluteFilePath()); |
277 cfgdir->setPath(f.absoluteFilePath()); |
277 custom_config = true; |
278 custom_config = true; |
278 } |
279 } |
279 else |
280 else |
280 { |
281 { |
281 cfgdir->setPath(QDir::homePath()); |
|
282 custom_config = false; |
282 custom_config = false; |
283 } |
283 } |
284 |
284 |
285 if (!parsedArgs.isEmpty()) |
285 if (!parsedArgs.isEmpty()) |
286 { |
286 { |