Macintosh-HW/RASCSI
1
0
Fork 0
mirror of https://github.com/akuker/RASCSI.git synced 2025-01-11 09:29:53 +00:00
Code Issues Projects Releases Wiki Activity

default_image_folder cannot be an empty string, removed obsolete check

Browse Source
This commit is contained in:
Uwe Seimet 2021-08-28 13:58:00 +02:00
parent 27136d7c20
commit cfd88e9ed2
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/raspberrypi/rascsi.cpp
View File

@ -747,8 +747,8 @@ bool ProcessCmd(int fd, const PbDeviceDefinition& pbDevice, const PbOperation op
} }
catch(const io_exception& e) { catch(const io_exception& e) {
// If the file does not exist search for it in the default image folder // If the file does not exist search for it in the default image folder
string file = default_image_folder + "/" + filename; string default_file = default_image_folder + "/" + filename;
filepath.SetPath(file.c_str()); filepath.SetPath(default_file.c_str());
try { try {
fileSupport->Open(filepath); fileSupport->Open(filepath);
} }
@ -887,19 +887,14 @@ bool ProcessCmd(int fd, const PbDeviceDefinition& pbDevice, const PbOperation op
fileSupport->Open(filepath); fileSupport->Open(filepath);
} }
catch(const io_exception& e) { catch(const io_exception& e) {
if (!default_image_folder.empty()) { // If the file does not exist search for it in the default image folder
// If the file does not exist search for it in the default image folder string default_file = default_image_folder + "/" + filename;
string default_file = default_image_folder + "/" + filename; filepath.SetPath(default_file.c_str());
filepath.SetPath(default_file.c_str()); try {
try { fileSupport->Open(filepath);
fileSupport->Open(filepath);
}
catch(const io_exception&) {
return ReturnStatus(fd, false, "Tried to open an invalid file '" + filename + "': " + e.getmsg());
}
} }
else { catch(const io_exception&) {
return ReturnStatus(fd, false, "No default image folder"); return ReturnStatus(fd, false, "Tried to open an invalid file '" + filename + "': " + e.getmsg());
} }
} }
} }