dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

Merge branch 'development' into LogBook_v2

Browse Source 
Conflicts:
	gui/bitmapLoader.py
This commit is contained in:
blitzman
2017-02-25 19:03:56 -05:00
parent 7115cd178c cb15a3a1d6
commit 6eddfd2694
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gui/bitmapLoader.py
View File

@@ -37,7 +37,7 @@ except ImportError:
class BitmapLoader(object):
try:
archive = zipfile.ZipFile(os.path.join(config.pyfaPath, 'imgs.zip', 'r'))
archive = zipfile.ZipFile(os.path.join(config.pyfaPath, 'imgs.zip'), 'r')
logging.info("Using zipped image files.")
except IOError:
logging.info("Using local image files.")