Fix $wireless_essid crashing conky if no argument provided.

Conky wasn't parsing the argument of the variable as it should, thus wasn't allocating the `dev` member variable. Also fix some documentation stuff.
Conky-for-macOS · Jul 12, 2018 · 800992d · 800992d
1 parent 504d27c
commit 800992d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/doc/variables.xml b/doc/variables.xml
@@ -4771,7 +4771,7 @@
             </command>
             <option>(net)</option>
         </term>
-        <listitem>Wireless access point MAC address (Linux only) 
+        <listitem>Wireless access point MAC address
         <para /></listitem>
     </varlistentry>
     <varlistentry>
@@ -4781,7 +4781,7 @@
             </command>
             <option>(net)</option>
         </term>
-        <listitem>Wireless bitrate (ie 11 Mb/s) (Linux only) 
+        <listitem>Wireless bitrate (ie 11 Mb/s)
         <para /></listitem>
     </varlistentry>
     <varlistentry>
@@ -4791,7 +4791,7 @@
             </command>
             <option>(net)</option>
         </term>
-        <listitem>WLAN channel on which device 'net' is listening (Linux only)
+        <listitem>WLAN channel on which device 'net' is listening
         <para /></listitem>
     </varlistentry>
     <varlistentry>
@@ -4801,7 +4801,7 @@
             </command>
             <option>(net)</option>
         </term>
-        <listitem>Wireless access point ESSID (Linux only) 
+        <listitem>Wireless access point ESSID
         <para /></listitem>
     </varlistentry>
     <varlistentry>
@@ -4811,7 +4811,7 @@
             </command>
             <option>(net)</option>
         </term>
-        <listitem>Frequency on which device 'net' is listening (Linux only)
+        <listitem>Frequency on which device 'net' is listening
         <para /></listitem>
     </varlistentry>
     <varlistentry>
@@ -4821,7 +4821,7 @@
             </command>
             <option>(height),(width) (net)</option>
         </term>
-        <listitem>Wireless link quality bar (Linux only) 
+        <listitem>Wireless link quality bar
         <para /></listitem>
     </varlistentry>
     <varlistentry>
@@ -4831,7 +4831,7 @@
             </command>
             <option>(net)</option>
         </term>
-        <listitem>Wireless link quality (Linux only) 
+        <listitem>Wireless link quality
         <para /></listitem>
     </varlistentry>
     <varlistentry>
@@ -4841,7 +4841,7 @@
             </command>
             <option>(net)</option>
         </term>
-        <listitem>Wireless link quality maximum value (Linux only) 
+        <listitem>Wireless link quality maximum value
         <para /></listitem>
     </varlistentry>
     <varlistentry>
@@ -4851,7 +4851,7 @@
             </command>
             <option>(net)</option>
         </term>
-        <listitem>Wireless link quality in percents (Linux only) 
+        <listitem>Wireless link quality in percents
         <para /></listitem>
     </varlistentry>
     <varlistentry>
@@ -4861,8 +4861,7 @@
             </command>
             <option>(net)</option>
         </term>
-        <listitem>Wireless mode (Managed/Ad-Hoc/Master) (Linux
-        only) 
+        <listitem>Wireless mode (Managed/Ad-Hoc/Master)
         <para /></listitem>
     </varlistentry>
     <varlistentry>

diff --git a/src/core.cc b/src/core.cc
@@ -486,6 +486,7 @@ struct text_object *construct_text_object(char *s, const char *arg, long line,
 #ifdef BUILD_WLAN
     END OBJ(wireless_essid, &update_net_stats) obj->data.opaque =
     get_net_stat(arg, obj, free_at_crash);
+    parse_net_stat_arg(obj, arg, free_at_crash);
     obj->callbacks.print = &print_wireless_essid;
     END OBJ(wireless_channel, &update_net_stats)
     parse_net_stat_arg(obj, arg, free_at_crash);