common: Fix handling of redirectdrives setting

diff --git a/client/common/cmdline.c b/client/common/cmdline.c
index c23c4d5..abb883a 100644 (file)
--- a/client/common/cmdline.c
+++ b/client/common/cmdline.c
@@ -3300,15 +3300,7 @@ BOOL freerdp_client_load_addins(rdpChannels* channels, rdpSettings* settings)
 
                settings->DeviceRedirection = TRUE;
        }
-
-       if (settings->RedirectDrives || settings->RedirectHomeDrive
-           || settings->RedirectSerialPorts
-           || settings->RedirectSmartCards || settings->RedirectPrinters)
-       {
-               settings->DeviceRedirection = TRUE; /* All of these features require rdpdr */
-       }
-
-       if (settings->RedirectDrives)
+       else if (settings->RedirectDrives)
        {
                if (!freerdp_device_collection_find(settings, "drive"))
                {
@@ -3322,6 +3314,13 @@ BOOL freerdp_client_load_addins(rdpChannels* channels, rdpSettings* settings)
                }
        }
 
+       if (settings->RedirectDrives || settings->RedirectHomeDrive
+           || settings->RedirectSerialPorts
+           || settings->RedirectSmartCards || settings->RedirectPrinters)
+       {
+               settings->DeviceRedirection = TRUE; /* All of these features require rdpdr */
+       }
+
        if (settings->RedirectHomeDrive)
        {
                if (!freerdp_device_collection_find(settings, "drive"))