Skip to content

[0.4.x] lv-tool: Fix crash on null VisVideo with VISUAL_EVENT_RESIZE #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hartwork merged 3 commits into from
Jan 28, 2023
Merged

[0.4.x] lv-tool: Fix crash on null VisVideo with VISUAL_EVENT_RESIZE #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb8344c
lv-tool: Fix crash on null VisVideo with VISUAL_EVENT_RESIZE
hartwork Jan 23, 2023
dc22023
lv-tool: Stop calling create(..) twice per window resize
hartwork Jan 23, 2023
5a257cb
lv-tool: Sync translation
hartwork Jan 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions libvisual/po/de.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libvisual 0.4.0-2.2\n"
"Report-Msgid-Bugs-To: https://github.com/Libvisual/libvisual/issues/\n"
"POT-Creation-Date: 2023-01-27 01:58+0100\n"
"POT-Creation-Date: 2023-01-27 22:45+0100\n"
"PO-Revision-Date: 2017-08-10 18:46+GMT\n"
"Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
Expand Down Expand Up @@ -900,7 +900,7 @@ msgstr ""
msgid "Invalid depth passed to the scaler"
msgstr "Ungültige Tiefe an Scaler übergeben"

#: tools/lv-tool/lv-tool.cpp:819 tools/lv-tool/lv-tool.cpp:916
#: tools/lv-tool/lv-tool.cpp:816 tools/lv-tool/lv-tool.cpp:913
msgid "lv-tool"
msgstr ""

Expand Down
4 changes: 2 additions & 2 deletions libvisual/po/es_AR.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Libvisual Library 0.4.0\n"
"Report-Msgid-Bugs-To: https://github.com/Libvisual/libvisual/issues/\n"
"POT-Creation-Date: 2023-01-27 01:58+0100\n"
"POT-Creation-Date: 2023-01-27 22:45+0100\n"
"PO-Revision-Date: 2005-03-20 17:09-0300\n"
"Last-Translator: <dprotti@users.sourceforge.net>\n"
"Language-Team: Spanish\n"
Expand Down Expand Up @@ -918,7 +918,7 @@ msgstr ""
msgid "Invalid depth passed to the scaler"
msgstr "Profundidad pasada al escalador inválida"

#: tools/lv-tool/lv-tool.cpp:819 tools/lv-tool/lv-tool.cpp:916
#: tools/lv-tool/lv-tool.cpp:816 tools/lv-tool/lv-tool.cpp:913
msgid "lv-tool"
msgstr ""

Expand Down
4 changes: 2 additions & 2 deletions libvisual/po/es_ES.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Libvisual Library 0.4.0\n"
"Report-Msgid-Bugs-To: https://github.com/Libvisual/libvisual/issues/\n"
"POT-Creation-Date: 2023-01-27 01:58+0100\n"
"POT-Creation-Date: 2023-01-27 22:45+0100\n"
"PO-Revision-Date: 2005-03-20 17:09-0300\n"
"Last-Translator: <dprotti@users.sourceforge.net>\n"
"Language-Team: Spanish\n"
Expand Down Expand Up @@ -918,7 +918,7 @@ msgstr ""
msgid "Invalid depth passed to the scaler"
msgstr "Profundidad pasada al escalador inválida"

#: tools/lv-tool/lv-tool.cpp:819 tools/lv-tool/lv-tool.cpp:916
#: tools/lv-tool/lv-tool.cpp:816 tools/lv-tool/lv-tool.cpp:913
msgid "lv-tool"
msgstr ""

Expand Down
4 changes: 2 additions & 2 deletions libvisual/po/libvisual-0.4.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: libvisual 0.4.1\n"
"Report-Msgid-Bugs-To: https://github.com/Libvisual/libvisual/issues/\n"
"POT-Creation-Date: 2023-01-27 01:58+0100\n"
"POT-Creation-Date: 2023-01-27 22:45+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -871,6 +871,6 @@ msgstr ""
msgid "Invalid depth passed to the scaler"
msgstr ""

#: tools/lv-tool/lv-tool.cpp:819 tools/lv-tool/lv-tool.cpp:916
#: tools/lv-tool/lv-tool.cpp:816 tools/lv-tool/lv-tool.cpp:913
msgid "lv-tool"
msgstr ""
9 changes: 3 additions & 6 deletions libvisual/tools/lv-tool/lv-tool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,8 +282,7 @@ namespace {
return m_screen_video;
}

void drain_events(VisEventQueue & eventqueue) {
// NOTE: SDL_VIDEORESIZE calls create(..) here as well
void drain_events(VisEventQueue & eventqueue, VisVideo * video) {
SDL_Event event;
while (SDL_PollEvent (&event)) {
switch (event.type) {
Expand All @@ -301,9 +300,7 @@ namespace {
break;

case SDL_VIDEORESIZE:
visual_event_queue_add_resize (&eventqueue, NULL, event.resize.w, event.resize.h);
// TODO non-NULL vidoptions here?
create (m_requested_depth, nullptr, event.resize.w, event.resize.h, m_resizable);
visual_event_queue_add_resize (&eventqueue, video, event.resize.w, event.resize.h);
break;

case SDL_MOUSEMOTION:
Expand Down Expand Up @@ -889,7 +886,7 @@ int main (int argc, char **argv)
static VisEvent ev;

// Handle all events
display.drain_events(*localqueue);
display.drain_events(*localqueue, video);

auto pluginqueue = visual_plugin_get_eventqueue (visual_actor_get_plugin(bin.get_actor()));

Expand Down