diff options
Diffstat (limited to 'Bootloaders/DFU/BootloaderDFU.c')
| -rw-r--r-- | Bootloaders/DFU/BootloaderDFU.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Bootloaders/DFU/BootloaderDFU.c b/Bootloaders/DFU/BootloaderDFU.c index 0385bfc49..160b9f657 100644 --- a/Bootloaders/DFU/BootloaderDFU.c +++ b/Bootloaders/DFU/BootloaderDFU.c @@ -127,6 +127,10 @@ void Application_Jump_Check(void) if ((MCUSR & (1 << WDRF)) && (MagicBootKey == MAGIC_BOOT_KEY)) JumpToApplication |= true; + /* Don't run the user application if the reset vector is blank (no app loaded) */ + + JumpToApplication = false; + /* If a request has been made to jump to the user application, honor it */ if (JumpToApplication) { @@ -751,8 +755,9 @@ static void ProcessWriteCommand(void) } else // Start via jump { - /* Set the flag to terminate the bootloader at next opportunity */ - RunBootloader = false; + /* Set the flag to terminate the bootloader at next opportunity if a valid application has been loaded */ + if (pgm_read_word_near(0) == 0xFFFF) + RunBootloader = false; } } } |