merge

Federico Fissore · Federico Fissore · commit bef7b94ea7a6 · 2013-10-14T12:42:42.000+02:00
diff --git a/hardware/arduino/avr/bootloaders/atmega/ATmegaBOOT_168.c b/hardware/arduino/avr/bootloaders/atmega/ATmegaBOOT_168.c
@@ -950,10 +950,10 @@ char getch(void)
 			count++;
 			if (count > MAX_TIME_COUNT)
 				app_start();
-			}
-
-			return UDR0;
 		}
+
+		return UDR0;
+	}
 	else if(bootuart == 2) {
 		while(!(UCSR1A & _BV(RXC1))) {
 			/* 20060803 DojoCorp:: Addon coming from the previous Bootloader*/               
diff --git a/libraries/SD/src/File.cpp b/libraries/SD/src/File.cpp
@@ -44,6 +44,7 @@ File::File(void) {
 }
 
 File::~File(void) {
+ close();
   //  Serial.print("Deleted file object");
 }
 

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ File::File(void) {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`File::~File(void) {`
	`47`	`+ close();`
`47`	`48`	`// Serial.print("Deleted file object");`
`48`	`49`	`}`
`49`	`50`