diff options
| author | Brianna | 2017-06-23 07:12:40 -0400 |
|---|---|---|
| committer | GitHub | 2017-06-23 07:12:40 -0400 |
| commit | 7d4fb7843849f8a90de13c1a1cb93ca9428fd3b1 (patch) | |
| tree | d8294bae70979f1134410f7794ca74a395f125ab /core.py | |
| parent | 3c903794e3588560f2b9d342214009d55a675d5a (diff) | |
| parent | 8c9914850e9987d4f05e8b88dedb058ffbb4f53f (diff) | |
Merge branch 'feature-newgui' into newgui-commandline
Diffstat (limited to 'core.py')
| -rw-r--r-- | core.py | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -22,7 +22,13 @@ class Core(): self.dataDir = QDesktopServices.storageLocation( QDesktopServices.DataLocation) self.presetDir = os.path.join(self.dataDir, 'presets') - self.wd = os.path.dirname(os.path.realpath(__file__)) + if getattr(sys, 'frozen', False): + # frozen + self.wd = os.path.dirname(sys.executable) + else: + # unfrozen + self.wd = os.path.dirname(os.path.realpath(__file__)) + self.loadEncoderOptions() self.videoFormats = Core.appendUppercase([ '*.mp4', |
