aboutsummaryrefslogtreecommitdiff
path: root/ShiftOS/ShiftOSDesktop.vb
diff options
context:
space:
mode:
Diffstat (limited to 'ShiftOS/ShiftOSDesktop.vb')
-rw-r--r--ShiftOS/ShiftOSDesktop.vb27
1 files changed, 17 insertions, 10 deletions
diff --git a/ShiftOS/ShiftOSDesktop.vb b/ShiftOS/ShiftOSDesktop.vb
index 6bb1267..447d01a 100644
--- a/ShiftOS/ShiftOSDesktop.vb
+++ b/ShiftOS/ShiftOSDesktop.vb
@@ -1620,17 +1620,24 @@
For Each Control In MyBase.Controls
Control.visible = False
Next
- loginform.ShowDialog()
+ If Skins.autologin = False Then
+ If Skins.fullScreen = False Then
+ loginform.ShowDialog()
+ Else
+ FullScreenLogin.ShowDialog()
+ End If
+ End If
- For Each Control In MyBase.Controls
- Control.visible = True
- hideStart()
- Next
- Try
- Helper.playSound(Paths.sounddir & "startup.wav", AudioPlayMode.WaitToComplete)
- Catch ex As Exception
- 'Do nothing -- Haven't found a good startup sound
- End Try
+
+ For Each Control In MyBase.Controls
+ Control.visible = True
+ hideStart()
+ Next
+ Try
+ Helper.playSound(Paths.sounddir & "startup.wav", AudioPlayMode.WaitToComplete)
+ Catch ex As Exception
+ 'Do nothing -- Haven't found a good startup sound
+ End Try
End Sub