Do not crash with an exception when editing hardware

yast · Feb 19, 2020 · 3a675ae · 3a675ae
1 parent 8117879
commit 3a675ae
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/lib/y2network/interface_config_builder.rb b/src/lib/y2network/interface_config_builder.rb
@@ -125,12 +125,16 @@ def save
         end
       end
 
+      yast_config.rename_interface(@old_name, name, renaming_mechanism) if renamed_interface?
+      yast_config.add_or_update_connection_config(@connection_config)
+      # Assign the new added interface in case of a new connection for an
+      # unplugged one (bsc#1162679)
+      interface = find_interface unless interface
+
       if interface.respond_to?(:custom_driver)
         interface.custom_driver = driver_auto? ? nil : driver.name
         yast_config.add_or_update_driver(driver) unless driver_auto?
       end
-      yast_config.rename_interface(@old_name, name, renaming_mechanism) if renamed_interface?
-      yast_config.add_or_update_connection_config(@connection_config)
 
       nil
     end
@@ -245,7 +249,7 @@ def ifplugd_priority
     def driver
       return @driver if @driver
 
-      if @interface.custom_driver
+      if @interface&.custom_driver
         @driver = yast_config.drivers.find { |d| d.name == @interface.custom_driver }
       end
       @driver ||= :auto