diff options
-rw-r--r-- | apps/lang/english.lang | 25 | ||||
-rw-r--r-- | apps/onplay.c | 11 |
2 files changed, 26 insertions, 10 deletions
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index b64ab859ec..b4abf68913 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -13395,20 +13395,37 @@ | |||
13395 | </voice> | 13395 | </voice> |
13396 | </phrase> | 13396 | </phrase> |
13397 | <phrase> | 13397 | <phrase> |
13398 | id: LANG_SET_HOTKEY | 13398 | id: LANG_SET_HOTKEY_QUESTION |
13399 | desc: hotkey splash | 13399 | desc: hotkey splash |
13400 | user: core | 13400 | user: core |
13401 | <source> | 13401 | <source> |
13402 | *: none | 13402 | *: none |
13403 | hotkey: "Set Hotkey: %s" | 13403 | hotkey: "Set Hotkey: %s?" |
13404 | </source> | 13404 | </source> |
13405 | <dest> | 13405 | <dest> |
13406 | *: none | 13406 | *: none |
13407 | hotkey: "Set Hotkey: %s" | 13407 | hotkey: "Set Hotkey: %s?" |
13408 | </dest> | 13408 | </dest> |
13409 | <voice> | 13409 | <voice> |
13410 | *: none | 13410 | *: none |
13411 | hotkey: "Set Hotkey: %s" | 13411 | hotkey: "Set Hotkey?" |
13412 | </voice> | ||
13413 | </phrase> | ||
13414 | <phrase> | ||
13415 | id: LANG_HOTKEY_ASSIGNED | ||
13416 | desc: Confirmation after the hotkey has been assigned | ||
13417 | user: core | ||
13418 | <source> | ||
13419 | *: none | ||
13420 | hotkey: "Assigned hotkey: %s" | ||
13421 | </source> | ||
13422 | <dest> | ||
13423 | *: none | ||
13424 | hotkey: "Assigned hotkey: %s" | ||
13425 | </dest> | ||
13426 | <voice> | ||
13427 | *: none | ||
13428 | hotkey: "Assigned hotkey" | ||
13412 | </voice> | 13429 | </voice> |
13413 | </phrase> | 13430 | </phrase> |
13414 | <phrase> | 13431 | <phrase> |
diff --git a/apps/onplay.c b/apps/onplay.c index 5a28c53cd4..246b8af6b1 100644 --- a/apps/onplay.c +++ b/apps/onplay.c | |||
@@ -1319,16 +1319,16 @@ static void set_hotkey(bool is_wps) | |||
1319 | if (!match_found || (this_hk == *hk_func)) return; | 1319 | if (!match_found || (this_hk == *hk_func)) return; |
1320 | 1320 | ||
1321 | char line1_buf[100]; | 1321 | char line1_buf[100]; |
1322 | char line2_buf[101]; | 1322 | char line2_buf[100]; |
1323 | char *line1 = line1_buf; | 1323 | char *line1 = line1_buf; |
1324 | char *line2 = line2_buf; | 1324 | char *line2 = line2_buf; |
1325 | char **line1_ptr = &line1; | 1325 | char **line1_ptr = &line1; |
1326 | char **line2_ptr = &line2; | 1326 | char **line2_ptr = &line2; |
1327 | const struct text_message message={(const char **)line2_ptr, 1}; | 1327 | const struct text_message message={(const char **)line1_ptr, 1}; |
1328 | const struct text_message yes_message={(const char **)line1_ptr, 1}; | 1328 | const struct text_message yes_message={(const char **)line2_ptr, 1}; |
1329 | 1329 | ||
1330 | snprintf(line1, 100, str(LANG_SET_HOTKEY), str(this_id)); | 1330 | snprintf(line1, sizeof(line1_buf), str(LANG_SET_HOTKEY_QUESTION), str(this_id)); |
1331 | strcat(strcpy(line2, line1), "?"); | 1331 | snprintf(line2, sizeof(line2_buf), str(LANG_HOTKEY_ASSIGNED), str(this_id)); |
1332 | 1332 | ||
1333 | /* confirm the hotkey setting change */ | 1333 | /* confirm the hotkey setting change */ |
1334 | if(gui_syncyesno_run(&message, &yes_message, NULL)==YESNO_YES) | 1334 | if(gui_syncyesno_run(&message, &yes_message, NULL)==YESNO_YES) |
@@ -1338,7 +1338,6 @@ static void set_hotkey(bool is_wps) | |||
1338 | *hk_desc = this_id; | 1338 | *hk_desc = this_id; |
1339 | 1339 | ||
1340 | settings_save(); | 1340 | settings_save(); |
1341 | splash(HZ*2, line1); | ||
1342 | } | 1341 | } |
1343 | } | 1342 | } |
1344 | #endif /* HOTKEY */ | 1343 | #endif /* HOTKEY */ |