Browse Source

Merge pull request #68345 from Abdul-AZ/master

Fix static object destructors being called on gpu selection with X11
Rémi Verschelde 2 years ago
parent
commit
29de658c29
1 changed files with 4 additions and 1 deletions
  1. 4 1
      platform/linuxbsd/x11/detect_prime_x11.cpp

+ 4 - 1
platform/linuxbsd/x11/detect_prime_x11.cpp

@@ -208,7 +208,10 @@ int detect_prime() {
 				print_verbose("Couldn't write vendor/renderer string.");
 				print_verbose("Couldn't write vendor/renderer string.");
 			}
 			}
 			close(fdset[1]);
 			close(fdset[1]);
-			exit(0);
+
+			// The function quick_exit() is used because exit() will call destructors on static objects copied by fork().
+			// These objects will be freed anyway when the process finishes execution.
+			quick_exit(0);
 		}
 		}
 	}
 	}