From aa978ab24631410126f7391e96cb643aa61c4b20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Jastrz=C4=99bski?= Date: Sat, 14 Oct 2017 22:10:31 +0200 Subject: [PATCH] Disabled old multiprocessing hack --- CHANGELOG.md | 3 +++ kcc.iss | 2 +- kcc.py | 3 ++- kindlecomicconverter/__init__.py | 2 +- other/osx/Info.plist | 6 +++--- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 997e0430..759b6ff8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,7 @@ # CHANGELOG +#### 5.4.3: +* Fixed conversion crash on Windows + #### 5.4.2: * Added Kindle Oasis 2 profile * Allowed metadata editor to edit directories diff --git a/kcc.iss b/kcc.iss index 52254260..28c54a43 100644 --- a/kcc.iss +++ b/kcc.iss @@ -1,5 +1,5 @@ #define MyAppName "Kindle Comic Converter" -#define MyAppVersion "5.4.2" +#define MyAppVersion "5.4.3" #define MyAppPublisher "Ciro Mattia Gonano, Paweł Jastrzębski" #define MyAppURL "http://kcc.iosphe.re/" #define MyAppExeName "KCC.exe" diff --git a/kcc.py b/kcc.py index afd47965..618c2cbe 100755 --- a/kcc.py +++ b/kcc.py @@ -34,6 +34,7 @@ else: os.environ['PATH'] = os.path.dirname(os.path.abspath(__file__)) + '/other/osx/:' + os.environ['PATH'] elif sys.platform.startswith('win'): + ''' import multiprocessing.popen_spawn_win32 as forking class _Popen(forking.Popen): @@ -50,7 +51,7 @@ def __init__(self, *args, **kw): else: os.putenv('_MEIPASS2', '') forking.Popen = _Popen - + ''' if getattr(sys, 'frozen', False): os.chdir(os.path.dirname(os.path.abspath(sys.executable))) else: diff --git a/kindlecomicconverter/__init__.py b/kindlecomicconverter/__init__.py index dad32ea0..cdb3623d 100644 --- a/kindlecomicconverter/__init__.py +++ b/kindlecomicconverter/__init__.py @@ -1,4 +1,4 @@ -__version__ = '5.4.2' +__version__ = '5.4.3' __license__ = 'ISC' __copyright__ = '2012-2017, Ciro Mattia Gonano , Pawel Jastrzebski ' __docformat__ = 'restructuredtext en' diff --git a/other/osx/Info.plist b/other/osx/Info.plist index 158bd621..1c50fa5c 100644 --- a/other/osx/Info.plist +++ b/other/osx/Info.plist @@ -30,7 +30,7 @@ CFBundleExecutable MacOS/Kindle Comic Converter CFBundleGetInfoString - KindleComicConverter 5.4.2, written 2012-2017 by Ciro Mattia Gonano and Pawel Jastrzebski + KindleComicConverter 5.4.3, written 2012-2017 by Ciro Mattia Gonano and Pawel Jastrzebski CFBundleIconFile comic2ebook.icns CFBundleIdentifier @@ -42,11 +42,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 5.4.2 + 5.4.3 CFBundleSignature ???? CFBundleVersion - 5.4.2 + 5.4.3 LSEnvironment PATH