Skip to content

Commit 85fb6d3

Browse files
authored
Merge branch 'master' into fix-outline-shownames
2 parents f769d4d + ccd93a3 commit 85fb6d3

2 files changed

Lines changed: 7 additions & 8 deletions

File tree

.github/workflows/build.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,15 @@ jobs:
3030
submodules: recursive
3131

3232
- name: Install Qt
33-
uses: jurplel/install-qt-action@v3
33+
uses: jurplel/install-qt-action@v4
3434
with:
3535
version: 6.5.3
3636
target: desktop
37-
arch: win64_msvc2019_64
37+
arch: win64_mingw
3838
cache: true
3939
cache-key-prefix: install-qt-action
4040
modules: 'qtimageformats qtwebsockets'
4141

42-
- name: Configure MSVC (Windows)
43-
uses: ilammy/msvc-dev-cmd@v1
44-
4542
- name: Install Windows Discord RPC
4643
shell: bash
4744
run: |
@@ -75,12 +72,14 @@ jobs:
7572
- name: Build Apng plugin
7673
run: |
7774
cd ./qtapng
78-
cmake . -D CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE="${{ github.workspace }}/bin/imageformats/"
75+
cmake . -G "MinGW Makefiles"
7976
cmake --build . --config Release
77+
mkdir -p ${{ github.workspace }}/bin/imageformats/
78+
cp plugins/imageformats/qapng.dll ${{ github.workspace }}/bin/imageformats/qapng.dll
8079
8180
- name: Build
8281
run: |
83-
cmake . -D CMAKE_BUILD_TYPE=Release
82+
cmake . -G "MinGW Makefiles" -D CMAKE_BUILD_TYPE=Release
8483
cmake --build . --config Release
8584
8685
- name: Deploy Windows

src/courtroom.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4612,7 +4612,7 @@ void Courtroom::play_sfx()
46124612
sfx_player->findAndPlaySfx(sfx_name);
46134613
if (Options::getInstance().loopingSfx())
46144614
{
4615-
sfx_player->setLooping(ao_app->get_sfx_looping(current_char, current_emote) == "1");
4615+
sfx_player->setLooping(m_chatmessage[LOOPING_SFX] == "1");
46164616
}
46174617
}
46184618

0 commit comments

Comments
 (0)