zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-10 14:51:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: wrong FString empty string check.

Browse source 
Even when '+logfile' argument was omitted, the console would print 'Could not start log', because 'logfile != NULL' was used as a check for the presence of '+logfile' argument, but the internal buffer of FString is never NULL, so the right check is 'logfile.isNotEmpty()'.
While I'm at it, I fixed another bad check for 'pagename'.
This commit is contained in:
Edoardo Prezioso 2014-07-18 01:00:38 +02:00
parent f99a84b498
commit 484eb347ca
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/d_main.cpp
View file

@ -1319,7 +1319,7 @@ void D_DoAdvanceDemo (void)
break; break;
} }
if (pagename) if (pagename.IsNotEmpty())
{ {
if (Page != NULL) if (Page != NULL)
{ {
@ -2235,7 +2235,7 @@ void D_DoomMain (void)
// +logfile gets checked too late to catch the full startup log in the logfile so do some extra check for it here. // +logfile gets checked too late to catch the full startup log in the logfile so do some extra check for it here.
FString logfile = Args->TakeValue("+logfile"); FString logfile = Args->TakeValue("+logfile");
if (logfile != NULL) if (logfile.IsNotEmpty())
{ {
execLogfile(logfile); execLogfile(logfile);
} }
@ -2273,7 +2273,7 @@ void D_DoomMain (void)
// The IWAD selection dialogue does not show in fullscreen so if the // The IWAD selection dialogue does not show in fullscreen so if the
// restart is initiated without a defined IWAD assume for now that it's not going to change. // restart is initiated without a defined IWAD assume for now that it's not going to change.
if (iwad.Len() == 0) iwad = lastIWAD; if (iwad.IsEmpty()) iwad = lastIWAD;
FIWadManager *iwad_man = new FIWadManager; FIWadManager *iwad_man = new FIWadManager;
const FIWADInfo *iwad_info = iwad_man->FindIWAD(allwads, iwad, basewad); const FIWADInfo *iwad_info = iwad_man->FindIWAD(allwads, iwad, basewad);