Destroy status windows; misc. cleanup

src/c/main.c

@@ -109,6 +109,8 @@ static char *s_options_under[2];
 
 ////////////////////// STATUS //////////////////////
 
+static void push_setter_window();
+
 static void click_handler_push_setter(void *recognizer, void *ctx) {
 	s_highlight_pos = 0;
 	s_skip_current_day = true; // setting the next alarm should assume the user meant tomorrow
@@ -120,10 +122,6 @@ static void click_handler_exit(void *recognizer, void *ctx) {
 	window_stack_pop_all(true);
 }
 
-static void click_handler_retry(void *recognizer, void *ctx) {
-	window_stack_pop(true);
-}
-
 static void status_confirmation_click_config_provider(void *ctx) {
 	window_single_click_subscribe(BUTTON_ID_BACK, click_handler_push_setter);
 	window_single_click_subscribe(BUTTON_ID_SELECT, click_handler_exit);
@@ -162,6 +160,7 @@ static void status_window_load(StatusWindowPurpose purpose) {
 
 static void status_window_unload() {
 	text_layer_destroy(s_status_txt_layer);
+	window_destroy(s_status_window);
 }
 
 static void push_status_window(StatusWindowPurpose purpose) {
@@ -450,7 +449,7 @@ static void update_for_new_triangle() {
 }
 
 static void increment_secs_since_last_input() {
-	if (s_secs_since_last_input < 10) {
+	if (s_secs_since_last_input < MAX_SECS_WITHOUT_INPUT) {
 		s_secs_since_last_input++;
 	}
 }