diff options
| author | TheUltimateHacker <[email protected]> | 2015-03-16 09:19:34 -0400 |
|---|---|---|
| committer | TheUltimateHacker <[email protected]> | 2015-03-16 09:19:34 -0400 |
| commit | 93d62dcac2c8ceb10d2f839614ca83c12c5902ee (patch) | |
| tree | 3818e6a48f43c97d0dcd4a52a05b50ee3a33bea0 /ShiftOS/Colour Picker.vb | |
| parent | 6278dd2510d692446e2baf0b079850e3e0250f2e (diff) | |
| parent | dda2964b748eafb3ff1105966f8a349069834cc0 (diff) | |
| download | shiftos-93d62dcac2c8ceb10d2f839614ca83c12c5902ee.tar.gz shiftos-93d62dcac2c8ceb10d2f839614ca83c12c5902ee.tar.bz2 shiftos-93d62dcac2c8ceb10d2f839614ca83c12c5902ee.zip | |
Merge remote-tracking branch 'origin/master'
Conflicts:
ShiftOS/skins.vb
Diffstat (limited to 'ShiftOS/Colour Picker.vb')
| -rw-r--r-- | ShiftOS/Colour Picker.vb | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ShiftOS/Colour Picker.vb b/ShiftOS/Colour Picker.vb index e1c3065..238b719 100644 --- a/ShiftOS/Colour Picker.vb +++ b/ShiftOS/Colour Picker.vb @@ -382,9 +382,12 @@ End Sub Private Sub Clock_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing - ShiftOSDesktop.programsopen = ShiftOSDesktop.programsopen - 1 - Me.Hide() - ShiftOSDesktop.setuppanelbuttons() + Try + ShiftOSDesktop.programsopen = ShiftOSDesktop.programsopen - 1 + Me.Hide() + ShiftOSDesktop.setuppanelbuttons() + Catch + End Try End Sub 'end of general setup @@ -2050,7 +2053,7 @@ ShiftOSDesktop.lastcolourpick = pnlnewcolour.BackColor Shifter.setuppreshifterstuff() End If - + Me.Close() End Sub |