rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix exception when logging Qt warning without function.

Browse Source
This commit is contained in:
Florian Bruhin 2014-11-09 22:57:39 +01:00
parent bc009ae624
commit 5f9c56bcdd
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
qutebrowser/utils/log.py
View File

@ -266,13 +266,17 @@ def qt_message_handler(msg_type, context, msg):
level = logging.DEBUG level = logging.DEBUG
else: else:
level = qt_to_logging[msg_type] level = qt_to_logging[msg_type]
# We get something like "void qt_png_warning(png_structp, png_const_charp)" if context.function is None:
# from Qt, but only want "qt_png_warning". func = 'none'
match = re.match(r'.*( |::)(\w*)\(.*\)', context.function)
if match is not None:
func = match.group(2)
else: else:
func = context.function # We get something like
# "void qt_png_warning(png_structp, png_const_charp)" from Qt, but only
# want "qt_png_warning".
match = re.match(r'.*( |::)(\w*)\(.*\)', context.function)
if match is not None:
func = match.group(2)
else:
func = context.function
name = 'qt' if context.category == 'default' else 'qt-' + context.category name = 'qt' if context.category == 'default' else 'qt-' + context.category
if msg.splitlines()[0] == ('This application failed to start because it ' if msg.splitlines()[0] == ('This application failed to start because it '
'could not find or load the Qt platform plugin ' 'could not find or load the Qt platform plugin '