fix and cleanup

This commit is contained in:
ingvar1995 2017-07-06 21:39:15 +03:00
parent d06982b38a
commit 262714d3ee
3 changed files with 10 additions and 17 deletions

View File

@ -57,5 +57,4 @@ setup(name='Toxygen',
}, },
cmdclass={ cmdclass={
'install': InstallScript, 'install': InstallScript,
}, })
)

View File

@ -454,15 +454,6 @@ def clean():
remove(d) remove(d)
def configure():
"""Removes unused libs"""
d = curr_directory() + '/libs/'
if os.path.exists(d + 'libtox.dll'):
os.remove(d + 'libtox.dll')
if os.path.exists(d + 'libsodium.a'):
os.remove(d + 'libsodium.a')
def reset(): def reset():
Settings.reset_auto_profile() Settings.reset_auto_profile()

View File

@ -857,12 +857,15 @@ class VideoSettings(CenteredWidget):
self.in_label.setText(QtWidgets.QApplication.translate("videoSettingsForm", "Device:")) self.in_label.setText(QtWidgets.QApplication.translate("videoSettingsForm", "Device:"))
def closeEvent(self, event): def closeEvent(self, event):
settings = Settings.get_instance() try:
settings.video['device'] = self.devices[self.input.currentIndex()] settings = Settings.get_instance()
text = self.video_size.currentText() settings.video['device'] = self.devices[self.input.currentIndex()]
settings.video['width'] = int(text.split(' ')[0]) text = self.video_size.currentText()
settings.video['height'] = int(text.split(' ')[-1]) settings.video['width'] = int(text.split(' ')[0])
settings.save() settings.video['height'] = int(text.split(' ')[-1])
settings.save()
except Exception as ex:
print('Saving video settings error: ' + str(ex))
def selectionChanged(self): def selectionChanged(self):
width, height = self.frame_max_sizes[self.input.currentIndex()] width, height = self.frame_max_sizes[self.input.currentIndex()]