Skip to content

Commit

Permalink
rev116, Fix websocket error when writing invalid files on not-owned s…
Browse files Browse the repository at this point in the history
…ites, Fix for stucked notification icon after shutdown
  • Loading branch information
shortcutme committed Apr 20, 2015
1 parent dc4292e commit f576527
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 3 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Decentralized websites using Bitcoin crypto and the BitTorrent network
* Tor network support
* Automatic, uPnP port opening
* Plugin for multiuser (openproxy) support
* Works with any browser/OS


## How does it work?
Expand Down
2 changes: 1 addition & 1 deletion plugins/Trayicon/lib/notificationicon.py
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@ def _run(self):
print "Icon thread stopped, removing icon..."
#KillTimer(self._hwnd, self._timerid)

Shell_NotifyIcon(NIM_DELETE, ctypes.pointer(iconinfo))
Shell_NotifyIcon(NIM_DELETE, ctypes.cast(ctypes.pointer(iconinfo), ctypes.POINTER(NOTIFYICONDATA)))
ctypes.windll.user32.DestroyWindow(self._hwnd)
ctypes.windll.user32.DestroyIcon(self._hicon)

Expand Down
2 changes: 1 addition & 1 deletion src/Config.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
class Config(object):
def __init__(self):
self.version = "0.2.9"
self.rev = 115
self.rev = 116
self.parser = self.createArguments()
argv = sys.argv[:] # Copy command line arguments
argv = self.parseConfig(argv) # Add arguments from config file
Expand Down
4 changes: 3 additions & 1 deletion src/Content/ContentManager.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,9 @@ def getFileInfo(self, inner_path):

def getIncludeInfo(self, inner_path):
if not inner_path.endswith("content.json"): # Find the files content.json first
inner_path = self.getFileInfo(inner_path)["content_inner_path"]
file_info = self.getFileInfo(inner_path)
if not file_info: return False # File not found
inner_path = file_info["content_inner_path"]
dirs = inner_path.split("/") # Parent dirs of content.json
inner_path_parts = [dirs.pop()] # Filename relative to content.json
inner_path_parts.insert(0, dirs.pop()) # Dont check in self dir
Expand Down

0 comments on commit f576527

Please sign in to comment.