release x11 connection for nvidia when quitting psensor

[psensor.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index a9b07b6..b9c8473 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -130,7 +130,6 @@ void update_psensor_measures(struct ui_psensor *ui)
        struct config *cfg = ui->config;
 
        while (1) {
-               /*gdk_threads_enter();*/
                g_mutex_lock(ui->sensors_mutex);
 
                if (!sensors)
@@ -146,7 +145,6 @@ void update_psensor_measures(struct ui_psensor *ui)
                nvidia_psensor_list_update(sensors);
 #endif
 
-               /*gdk_threads_leave();*/
                g_mutex_unlock(ui->sensors_mutex);
 
                sleep(cfg->sensor_update_interval);
@@ -163,11 +161,10 @@ gboolean ui_refresh_thread(gpointer data)
        cfg = ui->config;
 
        g_mutex_lock(ui->sensors_mutex);
-       /*gdk_threads_enter();*/
 
        graph_update(ui->sensors, ui->w_graph, ui->config);
 
-       ui_sensorlist_update(ui->ui_sensorlist);
+       ui_sensorlist_update(ui);
 
 #if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
        ui_appindicator_update(ui);
@@ -184,7 +181,6 @@ gboolean ui_refresh_thread(gpointer data)
        }
 
        g_mutex_unlock(ui->sensors_mutex);
-       /*gdk_threads_leave();*/
 
        if (ret == FALSE)
                g_timeout_add(1000 * ui->graph_update_interval,
@@ -387,7 +383,7 @@ int main(int argc, char **argv)
        ui.w_graph = ui_graph_create(&ui);
 
        /* sensor list */
-       ui.ui_sensorlist = ui_sensorlist_create(ui.sensors);
+       ui_sensorlist_create(&ui);
 
        ui_window_update(&ui);
 
@@ -412,5 +408,9 @@ int main(int argc, char **argv)
 
        psensor_list_free(ui.sensors);
 
+#ifdef HAVE_NVIDIA
+       nvidia_cleanup();
+#endif
+
        return 0;
 }