From: philsmd <philsmd@hashcat.net>
Date: Tue, 12 Jan 2016 00:02:23 +0000 (+0100)
Subject: fixed % and C (degrees celcius) in status display
X-Git-Tag: v3.00-beta~525^2
X-Git-Url: https://www.flypig.org.uk/git/?a=commitdiff_plain;h=2e1e3318ec018080e560cd3a735705faf0c70afc;p=hashcat.git

fixed % and C (degrees celcius) in status display
---

diff --git a/src/oclHashcat.c b/src/oclHashcat.c
index 66efe07..4a4fc3e 100644
--- a/src/oclHashcat.c
+++ b/src/oclHashcat.c
@@ -1503,12 +1503,12 @@ void status_display ()
 
       if (data.hm_device[i].fan_supported == 1)
       {
-        char temperature[HM_STR_BUF_SIZE];
         char utilization[HM_STR_BUF_SIZE];
+        char temperature[HM_STR_BUF_SIZE];
         char fanspeed[HM_STR_BUF_SIZE];
 
-        hm_device_val_to_str ((char *) temperature, HM_STR_BUF_SIZE, "%", hm_get_temperature_with_device_id (i));
-        hm_device_val_to_str ((char *) utilization, HM_STR_BUF_SIZE, "c", hm_get_utilization_with_device_id (i));
+        hm_device_val_to_str ((char *) utilization, HM_STR_BUF_SIZE, "%", hm_get_utilization_with_device_id (i));
+        hm_device_val_to_str ((char *) temperature, HM_STR_BUF_SIZE, "c", hm_get_temperature_with_device_id (i));
 
         if (data.vendor_id == VENDOR_ID_AMD)
         {
@@ -1528,11 +1528,11 @@ void status_display ()
       }
       else
       {
-        char temperature[HM_STR_BUF_SIZE];
         char utilization[HM_STR_BUF_SIZE];
+        char temperature[HM_STR_BUF_SIZE];
 
-        hm_device_val_to_str ((char *) temperature, HM_STR_BUF_SIZE, "%", hm_get_temperature_with_device_id (i));
-        hm_device_val_to_str ((char *) utilization, HM_STR_BUF_SIZE, "c", hm_get_utilization_with_device_id (i));
+        hm_device_val_to_str ((char *) utilization, HM_STR_BUF_SIZE, "%", hm_get_utilization_with_device_id (i));
+        hm_device_val_to_str ((char *) temperature, HM_STR_BUF_SIZE, "c", hm_get_temperature_with_device_id (i));
 
         log_info ("HWMon.GPU.#%d...: %s Util, %s Temp, N/A Fan", i + 1, utilization, temperature);
       }