From 100bf4d93adac7c207e5c0f0d81ebcee8534046b Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 19 Jul 2019 16:28:02 +0200
Subject: [vm] Move workaround to actually take effect

---
 src/main/java/org/openslx/util/vm/VmwareMetaData.java | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/openslx/util/vm/VmwareMetaData.java b/src/main/java/org/openslx/util/vm/VmwareMetaData.java
index c486be2..29227a7 100644
--- a/src/main/java/org/openslx/util/vm/VmwareMetaData.java
+++ b/src/main/java/org/openslx/util/vm/VmwareMetaData.java
@@ -132,6 +132,10 @@ public class VmwareMetaData extends VmMetaData<VmWareSoundCardMeta, VmWareDDAcce
 		for ( Entry<String, ConfigEntry> entry : config.entrySet() ) {
 			handleLoadEntry( entry );
 		}
+		// Fix accidentally filtered USB config if we see EHCI is present
+		if ( isSetAndTrue( "ehci.present" ) && !isSetAndTrue( "usb.present" ) ) {
+			addFiltered( "usb.present", "TRUE" );
+		}
 		// if we find this tag, we already went through the hdd's - so we're done.
 		if ( config.get( "#SLX_HDD_BUS" ) != null ) {
 			return;
@@ -170,11 +174,6 @@ public class VmwareMetaData extends VmMetaData<VmWareSoundCardMeta, VmWareDDAcce
 				addFiltered( "#SLX_HDD_CHIP", hdd.chipsetDriver );
 			}
 		}
-		
-		// Fix accidentally filtered USB config if we see EHCI is present
-		if ( isSetAndTrue( "ehci.present" ) && !isSetAndTrue( "usb.present" ) ) {
-			addFiltered( "usb.present", "TRUE" );
-		}
 	}
 
 	private void addFiltered( String key, String value )
-- 
cgit v1.2.3-55-g7522