X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui%2Fapp.cpp;h=9414dd4c6674ded2126adbacff1df1ef948e966c;hb=d207b11e613703aff7d00191c4595b7359f29700;hp=c0e434d15b692de90912f06d7596a6fcb63f13e8;hpb=00f18c4ebbfda2eb5a398cc3166c6ef1692c4f30;p=virtualjaguar diff --git a/src/gui/app.cpp b/src/gui/app.cpp index c0e434d..9414dd4 100644 --- a/src/gui/app.cpp +++ b/src/gui/app.cpp @@ -7,7 +7,7 @@ // JLH = James Hammons // // Who When What -// --- ---------- ------------------------------------------------------------- +// --- ---------- ----------------------------------------------------------- // JLH 12/23/2009 Created this file // JLH 01/21/2011 Added SDL initialization // JLH 06/26/2011 Added fix to keep SDL from hijacking main() on win32 @@ -61,11 +61,11 @@ int main(int argc, char * argv[]) if (AttachConsole != NULL && AttachConsole(((DWORD)-1))) { if (_fileno(stdout) == -1) - freopen("CONOUT$","wb",stdout); + freopen("CONOUT$", "wb", stdout); if (_fileno(stderr) == -1) - freopen("CONOUT$","wb",stderr); + freopen("CONOUT$", "wb", stderr); if (_fileno(stdin) == -1) - freopen("CONIN$","rb",stdin); + freopen("CONIN$", "rb", stdin); // Fix C++ std::ios::sync_with_stdio(); @@ -123,7 +123,8 @@ int main(int argc, char * argv[]) fclose(ctt); #endif #endif - LogDone(); // Close logfile + // Close logfile + LogDone(); return retVal; } @@ -136,12 +137,18 @@ App::App(int & argc, char * argv[]): QApplication(argc, argv) mainWindow = new MainWin(loadAndGo); mainWindow->plzDontKillMyComputer = noUntunedTankPlease; - ParseOptions(argc, argv); // Override defaults with command line (if any) + // Override defaults with command line (if any) + ParseOptions(argc, argv); mainWindow->SyncUI(); if (loadAndGo) + { mainWindow->LoadFile(filename); + if (!mainWindow->cartridgeLoaded) + printf("Could not load file \"%s\"!\n", filename.toUtf8().data()); + } + mainWindow->show(); } @@ -337,3 +344,4 @@ void ParseOptions(int argc, char * argv[]) char alpineROMPath[MAX_PATH]; char absROMPath[MAX_PATH]; #endif +