fix lock recursion (on eg windows)

.github/workflows/cd.yml

@@ -28,7 +28,7 @@ jobs:
       run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
 
     - name: Build
-      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4
+      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4 -t tomato
 
     - name: Determine tag name
       id: tag
@@ -67,6 +67,12 @@ jobs:
       with:
         submodules: recursive
 
+    - name: update vcpkg
+      shell: bash
+      run: |
+        cd C:/vcpkg
+        git pull
+
     - name: Install Dependencies
       run: vcpkg install libsodium:x64-windows-static pthreads:x64-windows-static pkgconf:x64-windows
 
@@ -82,7 +88,7 @@ jobs:
       run: cmake -G Ninja -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static -DSDL3IMAGE_VENDORED=ON -DSDL3IMAGE_DEPS_SHARED=ON -DSDL3IMAGE_JXL=OFF -DSDL3IMAGE_AVIF=OFF -DPKG_CONFIG_EXECUTABLE=C:/vcpkg/installed/x64-windows/tools/pkgconf/pkgconf.exe
 
     - name: Build
-      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -t tomato
 
     - name: Determine tag name
       id: tag
@@ -121,6 +127,12 @@ jobs:
       with:
         submodules: recursive
 
+    - name: update vcpkg
+      shell: bash
+      run: |
+        cd C:/vcpkg
+        git pull
+
     - name: Install Dependencies
       run: vcpkg install libsodium:x64-windows-static pthreads:x64-windows-static pkgconf:x64-windows
 
@@ -136,7 +148,7 @@ jobs:
       run: cmake -G Ninja -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static -DTOMATO_ASAN=ON -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded -DSDL3IMAGE_VENDORED=ON -DSDL3IMAGE_DEPS_SHARED=ON -DSDL3IMAGE_JXL=OFF -DSDL3IMAGE_AVIF=OFF -DPKG_CONFIG_EXECUTABLE=C:/vcpkg/installed/x64-windows/tools/pkgconf/pkgconf.exe
 
     - name: Build
-      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4
+      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4 -t tomato
 
     - name: Determine tag name
       id: tag

.github/workflows/ci.yml

@@ -27,7 +27,7 @@ jobs:
       run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
 
     - name: Build
-      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4
+      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4 -t tomato
 
   macos:
     timeout-minutes: 10
@@ -46,7 +46,7 @@ jobs:
       run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
 
     - name: Build
-      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4
+      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4 -t tomato
 
   windows:
     timeout-minutes: 15
@@ -58,6 +58,12 @@ jobs:
       with:
         submodules: recursive
 
+    - name: update vcpkg
+      shell: bash
+      run: |
+        cd C:/vcpkg
+        git pull
+
     - name: Install Dependencies
       run: vcpkg install libsodium:x64-windows-static pthreads:x64-windows-static pkgconf:x64-windows
 
@@ -73,5 +79,5 @@ jobs:
       run: cmake -G Ninja -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static -DSDL3IMAGE_VENDORED=ON -DSDL3IMAGE_DEPS_SHARED=ON -DSDL3IMAGE_JXL=OFF -DSDL3IMAGE_AVIF=OFF -DPKG_CONFIG_EXECUTABLE=C:/vcpkg/installed/x64-windows/tools/pkgconf/pkgconf.exe
 
     - name: Build
-      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4
+      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4 -t tomato
 

src/chat_gui4.cpp

@@ -154,12 +154,16 @@ void ChatGui4::setClipboardData(std::vector<std::string> mime_types, std::shared
 
 	std::vector<const char*> tmp_mimetype_list;
 
+	{
 		std::lock_guard lg{_set_clipboard_data_mutex};
 		for (const auto& mime_type : mime_types) {
 			tmp_mimetype_list.push_back(mime_type.data());
 			_set_clipboard_data[mime_type] = data;
 		}
 
+		// release lock, since on some platforms the callback is called immediatly
+	}
+
 	SDL_SetClipboardData(clipboard_callback, nullptr, this, tmp_mimetype_list.data(), tmp_mimetype_list.size());
 }
 

src/main.cpp

@@ -32,7 +32,7 @@ int main(int argc, char** argv) {
 
 	// more RAII
 	std::unique_ptr<SDL_Window, decltype(&SDL_DestroyWindow)> window {
-		SDL_CreateWindow("tomato", 640, 480, SDL_WINDOW_RESIZABLE),
+		SDL_CreateWindow("tomato", 1280, 720, SDL_WINDOW_RESIZABLE),
 		&SDL_DestroyWindow
 	};