[Fix] NULL dereferencing when ap is already NULL.

[apps/native/ug-wifi-direct.git] / popup-wifidirect / src / wfd-app-main.c

diff --git a/popup-wifidirect/src/wfd-app-main.c b/popup-wifidirect/src/wfd-app-main.c
index 2aba656..3067c67 100644 (file)
--- a/popup-wifidirect/src/wfd-app-main.c
+++ b/popup-wifidirect/src/wfd-app-main.c
@@ -163,18 +163,17 @@ static void _app_terminate(void *data)
        wfd_app_util_del_notification(ad);
 
        ret = wfd_app_util_deregister_vconf_callbacks(ad);
-       if (ret < 0) {
+       if (ret < 0)
                WFD_APP_LOG(WFD_APP_LOG_ERROR, "Failed to register vconf notification");
-       }
 
        /* Deregister Hardkey CB */
        wfd_app_util_deregister_hard_key_down_cb(ad);
 
        /* Deinitializes feedback API */
        ret = feedback_deinitialize();
-       if (ret != FEEDBACK_ERROR_NONE) {
+       if (ret != FEEDBACK_ERROR_NONE)
                WFD_APP_LOG(WFD_APP_LOG_ERROR, "feedback_deinitialize error : %d\n", ret);
-       }
+
        if (ad->transmit_timer) {
                ecore_timer_del(ad->transmit_timer);
                ad->transmit_timer = NULL;
@@ -183,9 +182,8 @@ static void _app_terminate(void *data)
        wfd_destroy_popup();
 
        ret = deinit_wfd_client(ad);
-       if (ret < 0) {
+       if (ret < 0)
                WFD_APP_LOG(WFD_APP_LOG_ERROR, "deinit_wfd_client error\n");
-       }
 
        if (ad->back_grnd) {
                evas_object_del(ad->back_grnd);
@@ -268,11 +266,11 @@ static void _app_reset(app_control_h control, void *data)
                app_control_set_app_id(ug_control, "setting-wifidirect-efl");
 
                ret = app_control_send_launch_request(ug_control, NULL, NULL);
-               if(ret == APP_CONTROL_ERROR_NONE) {
+               if (ret == APP_CONTROL_ERROR_NONE)
                        WFD_APP_LOG(WFD_APP_LOG_LOW, "Launch Wi-Fi Direct successful");
-               } else {
+               else
                        WFD_APP_LOG(WFD_APP_LOG_ERROR, "Fail to launch Wi-Fi Direct");
-               }
+
                app_control_destroy(ug_control);
 
        }