diff options
Diffstat (limited to 'rbutil/bootloaders.cpp')
-rwxr-xr-x | rbutil/bootloaders.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/rbutil/bootloaders.cpp b/rbutil/bootloaders.cpp index a2a52be209..dd92b4a343 100755 --- a/rbutil/bootloaders.cpp +++ b/rbutil/bootloaders.cpp | |||
@@ -276,9 +276,10 @@ bool h10(int mode) | |||
276 | { | 276 | { |
277 | wxString err,src,dest,path1,path2; | 277 | wxString err,src,dest,path1,path2; |
278 | 278 | ||
279 | int pos = gv->curbootloader.Find('/'); | 279 | int pos = gv->curbootloader.Find('/'); |
280 | if(pos == wxNOT_FOUND) pos = 0; | ||
280 | wxString firmwarename = gv->curbootloader.SubString(pos,gv->curbootloader.Length()); | 281 | wxString firmwarename = gv->curbootloader.SubString(pos,gv->curbootloader.Length()); |
281 | wxString firmDir = gv->curbootloader.SubString(0,pos); | 282 | //wxString firmDir = gv->curbootloader.SubString(0,pos); |
282 | 283 | ||
283 | if(mode == BOOTLOADER_ADD) | 284 | if(mode == BOOTLOADER_ADD) |
284 | { | 285 | { |
@@ -294,12 +295,12 @@ bool h10(int mode) | |||
294 | return false; | 295 | return false; |
295 | } | 296 | } |
296 | 297 | ||
297 | path1.Printf("%s" PATH_SEP "SYSTEM" PATH_SEP "%s",gv->curdestdir.c_str(),firmwarename.c_str()); | 298 | path1.Printf("%sSYSTEM" PATH_SEP "%s",gv->curdestdir.c_str(),firmwarename.c_str()); |
298 | path2.Printf("%s" PATH_SEP "SYSTEM" PATH_SEP "Original.mi4",gv->curdestdir.c_str()); | 299 | path2.Printf("%sSYSTEM" PATH_SEP "Original.mi4",gv->curdestdir.c_str()); |
299 | 300 | ||
300 | if(!wxFileExists(path1)) //Firmware dosent exists on player | 301 | if(!wxFileExists(path1)) //Firmware dosent exists on player |
301 | { | 302 | { |
302 | path1.Printf("%s" PATH_SEP "SYSTEM" PATH_SEP "H10EMP.mi4"); //attempt other firmwarename | 303 | path1.Printf("%sSYSTEM" PATH_SEP "H10EMP.mi4"); //attempt other firmwarename |
303 | if(!wxFileExists(path1)) //Firmware dosent exists on player | 304 | if(!wxFileExists(path1)) //Firmware dosent exists on player |
304 | { | 305 | { |
305 | err.Printf("[ERR] File %s does not Exist",path1.c_str()); | 306 | err.Printf("[ERR] File %s does not Exist",path1.c_str()); |
@@ -307,9 +308,9 @@ bool h10(int mode) | |||
307 | return false; | 308 | return false; |
308 | } | 309 | } |
309 | } | 310 | } |
310 | if(!wxFileExists(path2)) //there is already a original firmware | 311 | if(wxFileExists(path2)) //there is already a original firmware |
311 | { | 312 | { |
312 | err.Printf("[ERR] File %s does not Exist",path1.c_str()); | 313 | err.Printf("[ERR2] File %s does Exist",path2.c_str()); |
313 | ERR_DIALOG(err, _("Bootloader add")); | 314 | ERR_DIALOG(err, _("Bootloader add")); |
314 | return false; | 315 | return false; |
315 | } | 316 | } |
@@ -331,8 +332,8 @@ bool h10(int mode) | |||
331 | } | 332 | } |
332 | else if(mode == BOOTLOADER_REM) | 333 | else if(mode == BOOTLOADER_REM) |
333 | { | 334 | { |
334 | path1.Printf("%s" PATH_SEP "SYSTEM" PATH_SEP "%s",gv->curdestdir.c_str(),firmwarename.c_str()); | 335 | path1.Printf("%sSYSTEM" PATH_SEP "%s",gv->curdestdir.c_str(),firmwarename.c_str()); |
335 | path2.Printf("%s" PATH_SEP "SYSTEM" PATH_SEP "Original.mi4",gv->curdestdir.c_str()); | 336 | path2.Printf("%sSYSTEM" PATH_SEP "Original.mi4",gv->curdestdir.c_str()); |
336 | if(!wxFileExists(path1)) //Firmware dosent exists on player | 337 | if(!wxFileExists(path1)) //Firmware dosent exists on player |
337 | { | 338 | { |
338 | path1.Printf("%s" PATH_SEP "SYSTEM" PATH_SEP "H10EMP.mi4"); //attempt other firmwarename | 339 | path1.Printf("%s" PATH_SEP "SYSTEM" PATH_SEP "H10EMP.mi4"); //attempt other firmwarename |