equal
deleted
inserted
replaced
187 |
187 |
188 Q_INIT_RESOURCE(hedgewars); |
188 Q_INIT_RESOURCE(hedgewars); |
189 |
189 |
190 qRegisterMetaType<HWTeam>("HWTeam"); |
190 qRegisterMetaType<HWTeam>("HWTeam"); |
191 |
191 |
192 bindir->cd("bin"); // workaround over NSIS installer |
192 // workaround over NSIS installer which modifies the install path |
|
193 bindir->cd("./"); |
193 |
194 |
194 if(cConfigDir->length() == 0) |
195 if(cConfigDir->length() == 0) |
195 cfgdir->setPath(cfgdir->homePath()); |
196 cfgdir->setPath(cfgdir->homePath()); |
196 else |
197 else |
197 cfgdir->setPath(*cConfigDir); |
198 cfgdir->setPath(*cConfigDir); |
235 checkForDir(cfgdir->absolutePath() + "/VideoTemp"); |
236 checkForDir(cfgdir->absolutePath() + "/VideoTemp"); |
236 } |
237 } |
237 |
238 |
238 datadir->cd(bindir->absolutePath()); |
239 datadir->cd(bindir->absolutePath()); |
239 datadir->cd(*cDataDir); |
240 datadir->cd(*cDataDir); |
240 if(!datadir->cd("hedgewars/Data")) |
241 if(!datadir->cd("Data")) |
241 { |
242 { |
242 QMessageBox missingMsg(QApplication::activeWindow()); |
243 QMessageBox missingMsg(QApplication::activeWindow()); |
243 missingMsg.setIcon(QMessageBox::Critical); |
244 missingMsg.setIcon(QMessageBox::Critical); |
244 missingMsg.setWindowTitle(QMessageBox::tr("Main - Error")); |
245 missingMsg.setWindowTitle(QMessageBox::tr("Main - Error")); |
245 missingMsg.setText(QMessageBox::tr("Failed to open data directory:\n%1\n\n" |
246 missingMsg.setText(QMessageBox::tr("Failed to open data directory:\n%1\n\n" |
246 "Please check your installation!"). |
247 "Please check your installation!"). |
247 arg(datadir->absolutePath()+"/hedgewars/Data")); |
248 arg(datadir->absolutePath()+"/Data")); |
248 missingMsg.setWindowModality(Qt::WindowModal); |
249 missingMsg.setWindowModality(Qt::WindowModal); |
249 missingMsg.exec(); |
250 missingMsg.exec(); |
250 return 1; |
251 return 1; |
251 } |
252 } |
252 |
253 |