Sfoglia il codice sorgente

UI: Ensure rescale res is non-null and length > 0

John Bradley 10 anni fa
parent
commit
453b505637
1 ha cambiato i file con 10 aggiunte e 6 eliminazioni
  1. 10 6
      obs/window-basic-main-outputs.cpp

+ 10 - 6
obs/window-basic-main-outputs.cpp

@@ -414,9 +414,11 @@ inline void AdvancedOutput::SetupStreaming()
 	unsigned int cx = 0;
 	unsigned int cy = 0;
 
-	if (rescale && sscanf(rescaleRes, "%ux%u", &cx, &cy) != 2) {
-		cx = 0;
-		cy = 0;
+	if (rescale && rescaleRes && *rescaleRes) {
+		if (sscanf(rescaleRes, "%ux%u", &cx, &cy) != 2) {
+			cx = 0;
+			cy = 0;
+		}
 	}
 
 	obs_encoder_set_scaled_size(h264Streaming, cx, cy);
@@ -459,9 +461,11 @@ inline void AdvancedOutput::SetupRecording()
 	if (useStreamEncoder) {
 		obs_output_set_video_encoder(fileOutput, h264Streaming);
 	} else {
-		if (rescale && sscanf(rescaleRes, "%ux%u", &cx, &cy) != 2) {
-			cx = 0;
-			cy = 0;
+		if (rescale && rescaleRes && *rescaleRes) {
+			if (sscanf(rescaleRes, "%ux%u", &cx, &cy) != 2) {
+				cx = 0;
+				cy = 0;
+			}
 		}
 
 		obs_encoder_set_scaled_size(h264Recording, cx, cy);