save

reitowo · reitowo · commit ecc7e61057d0 · 2024-05-29T20:06:49.000+08:00
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -7,7 +7,6 @@ on:
 env:
   BUILD_TYPE: RelWithDebInfo
   BACKTRACE_SUBMIT_TOKEN: ${{ secrets.BACKTRACE_SUBMIT_TOKEN }}
-  VCPKG_PLATFORM_TOOLSET_VERSION: 14.34.31933
   VCPKG_ROOT: "C:/vcpkg"
 
 concurrency:
diff --git a/codec/nv12_to_bgra.cpp b/codec/nv12_to_bgra.cpp
@@ -474,6 +474,9 @@ ID3D11Texture2D *Nv12ToBgra::getSharedTargetTexture(ID3D11Device *dev, ID3D11Dev
     if (!_texture_rgba_copy_shared)
         return nullptr;
 
+    if (!dev || !ctx)
+        return nullptr;
+
     lock.lock();
 
     ID3D11Texture2D *src;
diff --git a/main.cpp b/main.cpp
@@ -242,7 +242,7 @@ void initializeCrashpad() {
 #endif
 
 void writeQtLogThread() {
-    std::cout << "writeQtLogThread start" << std::endl;
+    std::cout << "writeQtLogThread" << std::endl;
 
     QFile outFile(VLINK_LOG_FILE);
     outFile.open(QIODevice::WriteOnly | QIODevice::Append);
@@ -256,8 +256,6 @@ void writeQtLogThread() {
             QThread::msleep(1);
         }
     }
-
-    std::cout << "writeQtLogThread exit" << std::endl;
 }
 
 void customMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg) {

Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ void initializeCrashpad() {`
`242`	`242`	`#endif`
`243`	`243`
`244`	`244`	`void writeQtLogThread() {`
`245`		`- std::cout << "writeQtLogThread start" << std::endl;`
	`245`	`+ std::cout << "writeQtLogThread" << std::endl;`
`246`	`246`
`247`	`247`	`QFile outFile(VLINK_LOG_FILE);`
`248`	`248`	`outFile.open(QIODevice::WriteOnly \| QIODevice::Append);`
`@@ -256,8 +256,6 @@ void writeQtLogThread() {`
`256`	`256`	`QThread::msleep(1);`
`257`	`257`	`}`
`258`	`258`	`}`
`259`		`-`
`260`		`- std::cout << "writeQtLogThread exit" << std::endl;`
`261`	`259`	`}`
`262`	`260`
`263`	`261`	`void customMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg) {`