diff options
| author | pfg github <[email protected]> | 2015-03-10 15:49:47 -0700 |
|---|---|---|
| committer | pfg github <[email protected]> | 2015-03-10 15:49:47 -0700 |
| commit | 8ab947a2fca681557242af803b71cc93f404a053 (patch) | |
| tree | ae37028b0f7dcd6b064c0e584f5e58e9b11790dd | |
| parent | a2361f8ea1ab017c39a1ce9d0ba86da2e9903ba0 (diff) | |
| download | shiftos-8ab947a2fca681557242af803b71cc93f404a053.tar.gz shiftos-8ab947a2fca681557242af803b71cc93f404a053.tar.bz2 shiftos-8ab947a2fca681557242af803b71cc93f404a053.zip | |
Fixed crash with icons. Fixed icon dragging. Dragged icons don't save
| -rw-r--r-- | ShiftOS/ShiftOSDesktop.vb | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/ShiftOS/ShiftOSDesktop.vb b/ShiftOS/ShiftOSDesktop.vb index 40dccdd..9a23926 100644 --- a/ShiftOS/ShiftOSDesktop.vb +++ b/ShiftOS/ShiftOSDesktop.vb @@ -1573,7 +1573,11 @@ SortOutBooleans(VideoPlayerCorrupted, 610, True) SortOutBooleans(VirusScannerCorrupted, 612, True) SortOutBooleans(WebBrowserCorrupted, 613, True) - If loadlines(614) = 11 Then boughtdesktopicons = True Else boughtdesktopicons = False + Try + If loadlines(614) = 11 Then boughtdesktopicons = True Else boughtdesktopicons = False + Catch + boughtdesktopicons = False + End Try Viruses.startactiveviruses() If IO.File.Exists(ShiftOSPath + "Shiftum42\Skins\Current\skindata.dat") Then loadcurrentskin() If My.Computer.FileSystem.DirectoryExists(ShiftOSPath + "Shiftum42\Icons") Then setupicons() @@ -4775,7 +4779,11 @@ If Skins.enabledraggableicons = True Then Dim lvi As ListViewItem = CType(e.Data.GetData("System.Windows.Forms.ListViewItem"), ListViewItem) Dim Offset As Size = Size.Subtract(Cursor.Size, New Size(Cursor.HotSpot.X, Cursor.HotSpot.Y)) - lvi.Position = Point.Subtract(desktopicons.PointToClient(New Point(e.X, e.Y)), Offset) + If (e.X < 53) Then + lvi.Position = Point.Subtract(desktopicons.PointToClient(New Point(53, e.Y)), Offset) + Else + lvi.Position = Point.Subtract(desktopicons.PointToClient(New Point(e.X, e.Y)), Offset) + End If e.Effect = DragDropEffects.Move End If |