From: Dean Camera Date: Mon, 21 May 2012 20:48:57 +0000 (+0000) Subject: AppConfigHeaders: Merge in latest trunk. X-Git-Tag: LUFA-120730~6^2~4 X-Git-Url: http://git.linex4red.de/pub/USBasp.git/commitdiff_plain/5ec9d04bcaa0f48098441f36dd6d048ff32ecb99?hp=5f709e281eec223c5de9766a99bdd54339e149cb AppConfigHeaders: Merge in latest trunk. --- diff --git a/Bootloaders/CDC/BootloaderCDC.c b/Bootloaders/CDC/BootloaderCDC.c index 211b054e3..7bff89994 100644 --- a/Bootloaders/CDC/BootloaderCDC.c +++ b/Bootloaders/CDC/BootloaderCDC.c @@ -73,7 +73,13 @@ void Application_Jump_Check(void) /* If the reset source was the bootloader and the key is correct, clear it and jump to the application */ if ((MCUSR & (1 << WDRF)) && (MagicBootKey == MAGIC_BOOT_KEY)) { + /* Turn off the watchdog */ + MCUSR &= ~(1<