raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Fix bug #1206886: only write to the socket if it exists

Browse Source
This commit is contained in:
Raoul Snyman 2013-12-22 01:26:36 +02:00
parent 6d86abaa37
commit 232492b57e
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/plugins/bibles/lib/db.py
View File

@ -1061,7 +1061,7 @@ class OldBibleDB(QtCore.QObject, Manager):
QtCore.QObject.__init__(self)
if u'path' not in kwargs:
raise KeyError(u'Missing keyword argument "path".')
if u'file' not in kwargs:
if u'file' not in kwargs:
raise KeyError(u'Missing keyword argument "file".')
if u'path' in kwargs:
self.path = kwargs[u'path']

7
openlp/plugins/remotes/lib/httpserver.py
View File

@ -593,8 +593,11 @@ class HttpConnection(object):
for header, value in response.headers.iteritems():
http += '%s: %s\r\n' % (header, value)
http += '\r\n'
self.socket.write(http)
self.socket.write(response.content)
if self.socket:
# Write to the socket if it's open, else ignore it.
# See http://support.openlp.org/scp/tickets.php?id=2112
self.socket.write(http)
self.socket.write(response.content)
def disconnected(self):
"""