From 8cdfb3e90003acbcf1b84235f614ad3f33ce46a4 Mon Sep 17 00:00:00 2001 From: qurious-pixel <62252937+qurious-pixel@users.noreply.github.com> Date: Wed, 13 Jan 2021 07:10:39 -0800 Subject: [PATCH] Update docker.sh -Fix freezing when closing the window -Fix Deriving Keys window not being a child of main --- .github/workflows/docker.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/docker.sh b/.github/workflows/docker.sh index 007494245..4e726e1c0 100644 --- a/.github/workflows/docker.sh +++ b/.github/workflows/docker.sh @@ -14,6 +14,11 @@ find . -name "CMakeLists.txt" -exec sed -i 's/^.*-Werror=.*)$/ )/g' {} + find . -name "CMakeLists.txt" -exec sed -i 's/^.*-Werror=.*$/ /g' {} + find . -name "CMakeLists.txt" -exec sed -i 's/-Werror/-W/g' {} + +#Fix freezing when closing the window +sed -i -e '0,/is_thread_exiting.store(true);/! s/is_thread_exiting.store(true);/&\n cv.notify_all();/' src/video_core/shader/async_shaders.cpp +#Fix Deriving Keys window not being a child of main +sed -i -e 's/QProgressDialog prog;/QProgressDialog prog(this);/g' src/yuzu/main.cpp + mkdir build && cd build cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=/usr/lib/ccache/gcc -DCMAKE_CXX_COMPILER=/usr/lib/ccache/g++ -DTITLE_BAR_FORMAT_IDLE="$title" -DTITLE_BAR_FORMAT_RUNNING="$title | {3}" -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DGIT_BRANCH="HEAD" -DGIT_DESC="$msvc" -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON