V0.6 #852

Merged
Atheros1 merged 399 commits from v0.6 into master 2016-05-03 01:58:38 +02:00
2 changed files with 4 additions and 4 deletions
Showing only changes of commit 8136b022bc - Show all commits

View File

@ -35,7 +35,7 @@ def loadConfig():
needToCreateKeysFile = True
else:
shared.config.read(shared.lookupExeFolder() + 'keys.dat'))
shared.config.read(shared.lookupExeFolder() + 'keys.dat')
try:
shared.config.get('bitmessagesettings', 'settingsversion')
print 'Loading config files from same directory as program.'

View File

@ -200,9 +200,9 @@ def assembleErrorMessage(fatal=0, banTime=0, inventoryVector='', errorText=''):
def lookupExeFolder():
if frozen:
exeFolder = os.path.join(os.path.dirname(sys.executable), '/')
exeFolder = path.dirname(sys.executable) + path.sep
elif __file__:
exeFolder = os.path.join(os.path.dirname(__file__), '/')
exeFolder = path.dirname(__file__) + path.sep
else:
exeFolder = ''
return exeFolder