Proper move from 'Shifter from Console' into 'App Shifter' command

1 files changed, 19 insertions, 11 deletions

diff --git a/ShiftOS-TheRevival/MainForms/Applications/Shifter/DuWM/DuWM_Shifter.vb b/ShiftOS-TheRevival/MainForms/Applications/Shifter/DuWM/DuWM_Shifter.vb
index fdd9ba2..b0b4afb 100644
--- a/ShiftOS-TheRevival/MainForms/Applications/Shifter/DuWM/DuWM_Shifter.vb
+++ b/ShiftOS-TheRevival/MainForms/Applications/Shifter/DuWM/DuWM_Shifter.vb
@@ -2,7 +2,7 @@
     Private PrevHeight As Integer = Height
     Private PrevWidth As Integer = Width
     Private FeatureGap As Integer = 450 - 400
-    Private ChildFeature As UserControl
+    Private ChildFeature As String
 
     Private Sub Shifter_Load(sender As Object, e As EventArgs) Handles MyBase.Load
 
@@ -21,15 +21,23 @@
     End Sub
 
     Private Sub lst_Features_SelectedIndexChanged(sender As Object, e As EventArgs) Handles lst_Features.SelectedIndexChanged
-        Select Case lst_Features.SelectedItem
-            Case "Desktop"
-                Dim Shifter_Desktop As New DuWM_Shifter_Desktop
-                Shifter_Desktop.Size = pnl_Content.Size
-                pnl_Content.Controls.Clear()
-                pnl_Content.Controls.Add(Shifter_Desktop)
-            Case "About"
-                pnl_Content.Controls.Clear()
-                MsgBox("Aboot")
-        End Select
+        If lst_Features.SelectedItem = ChildFeature Then
+
+        Else
+            Select Case lst_Features.SelectedItem
+                Case "Desktop"
+                    Dim Shifter_Desktop As New DuWM_Shifter_Desktop
+                    Shifter_Desktop.Size = pnl_Content.Size
+                    ChildFeature = "Desktop"
+                    pnl_Content.Controls.Clear()
+                    pnl_Content.Controls.Add(Shifter_Desktop)
+                Case "About"
+                    ChildFeature = "About"
+                    Dim Shifter_About As New DuWM_Shifter_About
+                    Shifter_About.Size = pnl_Content.Size
+                    pnl_Content.Controls.Clear()
+                    pnl_Content.Controls.Add(Shifter_About)
+            End Select
+        End If
     End Sub
 End Class
\ No newline at end of file