Merge pull request #5 from mchf/master

disable '-o' option for dummy module if hwcfg widget doesn't exist
yast · Jul 18, 2012 · aeb089d · aeb089d
2 parents 6364a3d + 5d400ba
commit aeb089d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.24.0
+2.24.1
diff --git a/package/yast2-network.changes b/package/yast2-network.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jul 16 09:01:25 UTC 2012 - mfilka@suse.com
+
+- bnc#767946 - configuring dummy netwok interface error
+  disable '-o' option for dummy module hwcfg widget doesn't exist
+- 2.24.1
+
 -------------------------------------------------------------------
 Mon Jul  2 09:23:14 UTC 2012 - mfilka@suse.com
 

diff --git a/src/lan/hardware.ycp b/src/lan/hardware.ycp
@@ -416,10 +416,14 @@ symbol handleHW (string key, map event) {
 	    }
 	    else if (hardware["type"]:"" == "dummy") // #44582
 	    {
-		hardware["hwcfg"] = (string) UI::QueryWidget (`id (`hwcfg), `Value);
-
 		hardware["modul"] = "dummy";
-		hardware["options"] = sformat ("-o dummy-%1", hardware["hwcfg"]:"");
+
+                if( UI::WidgetExists( `id( `hwcfg))) // bnc#767946
+                {
+		    hardware["hwcfg"] = (string) UI::QueryWidget (`id (`hwcfg), `Value);
+		    hardware["options"] = sformat ("-o dummy-%1", hardware["hwcfg"]:"");
+                }
+
 		UI::ChangeWidget(`id(`modul), `Value, hardware["modul"]:"");
 		UI::ChangeWidget(`id(`options), `Value, hardware["options"]:"");
 	    }