diff options
Diffstat (limited to 'apps/wps.c')
-rw-r--r-- | apps/wps.c | 44 |
1 files changed, 27 insertions, 17 deletions
diff --git a/apps/wps.c b/apps/wps.c index f1b0e214a7..0f393a0faf 100644 --- a/apps/wps.c +++ b/apps/wps.c | |||
@@ -499,6 +499,33 @@ static bool menu(void) | |||
499 | 499 | ||
500 | while (!exit) { | 500 | while (!exit) { |
501 | int button = button_get(true); | 501 | int button = button_get(true); |
502 | |||
503 | /* these are never locked */ | ||
504 | switch (button) | ||
505 | { | ||
506 | /* key lock */ | ||
507 | #ifdef HAVE_RECORDER_KEYPAD | ||
508 | case BUTTON_F1 | BUTTON_DOWN: | ||
509 | #else | ||
510 | case BUTTON_MENU | BUTTON_STOP: | ||
511 | #endif | ||
512 | keys_locked = !keys_locked; | ||
513 | display_keylock_text(keys_locked); | ||
514 | exit = true; | ||
515 | while (button_get(false)); /* clear button queue */ | ||
516 | break; | ||
517 | |||
518 | case SYS_USB_CONNECTED: | ||
519 | status_set_playmode(STATUS_STOP); | ||
520 | usb_screen(); | ||
521 | keys_locked = false; | ||
522 | return true; | ||
523 | } | ||
524 | |||
525 | if (keys_locked) { | ||
526 | display_keylock_text(true); | ||
527 | break; | ||
528 | } | ||
502 | 529 | ||
503 | switch ( button ) { | 530 | switch ( button ) { |
504 | /* go into menu */ | 531 | /* go into menu */ |
@@ -539,18 +566,6 @@ static bool menu(void) | |||
539 | display_mute_text(muted); | 566 | display_mute_text(muted); |
540 | break; | 567 | break; |
541 | 568 | ||
542 | /* key lock */ | ||
543 | #ifdef HAVE_RECORDER_KEYPAD | ||
544 | case BUTTON_F1 | BUTTON_DOWN: | ||
545 | #else | ||
546 | case BUTTON_MENU | BUTTON_STOP: | ||
547 | #endif | ||
548 | keys_locked = !keys_locked; | ||
549 | display_keylock_text(keys_locked); | ||
550 | exit = true; | ||
551 | while (button_get(false)); /* clear button queue */ | ||
552 | break; | ||
553 | |||
554 | #ifdef BUTTON_MENU | 569 | #ifdef BUTTON_MENU |
555 | /* change volume */ | 570 | /* change volume */ |
556 | case BUTTON_MENU | BUTTON_LEFT: | 571 | case BUTTON_MENU | BUTTON_LEFT: |
@@ -584,11 +599,6 @@ static bool menu(void) | |||
584 | #endif | 599 | #endif |
585 | exit = true; | 600 | exit = true; |
586 | break; | 601 | break; |
587 | |||
588 | case SYS_USB_CONNECTED: | ||
589 | status_set_playmode(STATUS_STOP); | ||
590 | usb_screen(); | ||
591 | return true; | ||
592 | } | 602 | } |
593 | last_button = button; | 603 | last_button = button; |
594 | } | 604 | } |