Merge 3e3101f into e08b1a6

yast · Sep 2, 2019 · 37adf74 · 37adf74
2 parents e08b1a6 + 3e3101f
commit 37adf74
Show file tree

Hide file tree

Showing 14 changed files with 77 additions and 1,897 deletions.
diff --git a/src/data/network/s390_defaults.yml b/src/data/network/s390_defaults.yml
diff --git a/src/data/network/sysconfig_defaults.yml b/src/data/network/sysconfig_defaults.yml
diff --git a/src/include/network/lan/address.rb b/src/include/network/lan/address.rb
@@ -103,11 +103,6 @@ def AddressDialog(builder:)
         LanItems.add_device_to_routing if LanItems.update_routing_devices?
       end
 
-      # rollback if changes are canceled, as still some widgets edit LanItems directly
-      LanItems.Rollback if ret != :next
-      # proceed with WLAN settings if appropriate, #42420
-      ret = :wire if ret == :next && builder.type.wireless?
-
       log.info "AddressDialog res: #{ret.inspect}"
       ret
     end