From 4aac4aa2e62f3ba82cd93925b4cea0749f23d727 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 23 Jan 2017 14:15:26 +0100 Subject: [PATCH] Revert "Use task_set_title" This reverts commit c867784898efa94f39911512ecd2202191efef38. --- tasks/task_netplay_find_content.c | 3 +-- tasks/task_netplay_lan_scan.c | 3 +-- tasks/task_save.c | 12 ++++-------- tasks/task_screenshot.c | 2 +- tasks/task_wifi.c | 4 ++-- 5 files changed, 9 insertions(+), 15 deletions(-) diff --git a/tasks/task_netplay_find_content.c b/tasks/task_netplay_find_content.c index 1b790538d4..c84e03a0cf 100644 --- a/tasks/task_netplay_find_content.c +++ b/tasks/task_netplay_find_content.c @@ -218,8 +218,7 @@ bool task_push_netplay_crc_scan(uint32_t crc, char* name, task->state = state; task->handler = task_netplay_crc_scan_handler; task->callback = netplay_crc_scan_callback; - - task_set_title(task, strdup("Looking for matching content...")); + task->title = strdup("Looking for matching content..."); task_queue_ctl(TASK_QUEUE_CTL_PUSH, task); diff --git a/tasks/task_netplay_lan_scan.c b/tasks/task_netplay_lan_scan.c index 68ba63fe44..38c86c3789 100644 --- a/tasks/task_netplay_lan_scan.c +++ b/tasks/task_netplay_lan_scan.c @@ -89,8 +89,7 @@ bool task_push_netplay_lan_scan(void) task->type = TASK_TYPE_BLOCKING; task->handler = task_netplay_lan_scan_handler; task->callback = netplay_lan_scan_callback; - - task_set_title(task, strdup(msg_hash_to_str(MSG_NETPLAY_LAN_SCANNING))); + task->title = strdup(msg_hash_to_str(MSG_NETPLAY_LAN_SCANNING)); task_queue_ctl(TASK_QUEUE_CTL_PUSH, task); diff --git a/tasks/task_save.c b/tasks/task_save.c index 34febe78e9..452ea44790 100644 --- a/tasks/task_save.c +++ b/tasks/task_save.c @@ -646,8 +646,7 @@ static bool task_push_undo_save_state(const char *path, void *data, size_t size) task->state = state; task->handler = task_save_handler; task->callback = undo_save_state_cb; - - task_set_title(task, strdup(msg_hash_to_str(MSG_UNDOING_SAVE_STATE))); + task->title = strdup(msg_hash_to_str(MSG_UNDOING_SAVE_STATE)); task_queue_ctl(TASK_QUEUE_CTL_PUSH, task); @@ -1004,10 +1003,9 @@ static void task_push_save_state(const char *path, void *data, size_t size, bool task->state = state; task->handler = task_save_handler; task->callback = save_state_cb; + task->title = strdup(msg_hash_to_str(MSG_SAVING_STATE)); task->mute = state->mute; - task_set_title(task, strdup(msg_hash_to_str(MSG_SAVING_STATE))); - task_queue_ctl(TASK_QUEUE_CTL_PUSH, task); return; @@ -1073,10 +1071,9 @@ static void task_push_load_and_save_state(const char *path, void *data, task->type = TASK_TYPE_BLOCKING; task->handler = task_load_handler; task->callback = content_load_and_save_state_cb; + task->title = strdup(msg_hash_to_str(MSG_LOADING_STATE)); task->mute = state->mute; - task_set_title(task, strdup(msg_hash_to_str(MSG_LOADING_STATE))); - task_queue_ctl(TASK_QUEUE_CTL_PUSH, task); return; @@ -1208,8 +1205,7 @@ bool content_load_state(const char *path, task->state = state; task->handler = task_load_handler; task->callback = content_load_state_cb; - - task_set_title(task, strdup(msg_hash_to_str(MSG_LOADING_STATE))); + task->title = strdup(msg_hash_to_str(MSG_LOADING_STATE)); task_queue_ctl(TASK_QUEUE_CTL_PUSH, task); diff --git a/tasks/task_screenshot.c b/tasks/task_screenshot.c index 7b233bf885..8687ab3b73 100644 --- a/tasks/task_screenshot.c +++ b/tasks/task_screenshot.c @@ -258,7 +258,7 @@ static bool screenshot_dump( task->handler = task_screenshot_handler; if (!savestate) - task_set_title(task, strdup(msg_hash_to_str(MSG_TAKING_SCREENSHOT))); + task->title = strdup(msg_hash_to_str(MSG_TAKING_SCREENSHOT)); task_queue_ctl(TASK_QUEUE_CTL_PUSH, task); diff --git a/tasks/task_wifi.c b/tasks/task_wifi.c index 017a9d089f..8fc081cbcb 100644 --- a/tasks/task_wifi.c +++ b/tasks/task_wifi.c @@ -100,8 +100,8 @@ bool task_push_wifi_scan(void) task->state = state; task->handler = task_wifi_scan_handler; task->callback = wifi_scan_callback; - - task_set_title(task, strdup(msg_hash_to_str(MSG_SCANNING_WIRELESS_NETWORKS))); + task->title = strdup(msg_hash_to_str( + MSG_SCANNING_WIRELESS_NETWORKS)); task_queue_ctl(TASK_QUEUE_CTL_PUSH, task);