2
0
Эх сурвалжийг харах

Merge pull request #43703 from Xrayez/premature-timer

Do not start `Timer` upon manual switching of internal process
Rémi Verschelde 4 жил өмнө
parent
commit
68ddab547b

+ 2 - 2
scene/main/timer.cpp

@@ -46,7 +46,7 @@ void Timer::_notification(int p_what) {
 			}
 			}
 		} break;
 		} break;
 		case NOTIFICATION_INTERNAL_PROCESS: {
 		case NOTIFICATION_INTERNAL_PROCESS: {
-			if (timer_process_mode == TIMER_PROCESS_PHYSICS || !is_processing_internal()) {
+			if (!processing || timer_process_mode == TIMER_PROCESS_PHYSICS || !is_processing_internal()) {
 				return;
 				return;
 			}
 			}
 			time_left -= get_process_delta_time();
 			time_left -= get_process_delta_time();
@@ -63,7 +63,7 @@ void Timer::_notification(int p_what) {
 
 
 		} break;
 		} break;
 		case NOTIFICATION_INTERNAL_PHYSICS_PROCESS: {
 		case NOTIFICATION_INTERNAL_PHYSICS_PROCESS: {
-			if (timer_process_mode == TIMER_PROCESS_IDLE || !is_physics_processing_internal()) {
+			if (!processing || timer_process_mode == TIMER_PROCESS_IDLE || !is_physics_processing_internal()) {
 				return;
 				return;
 			}
 			}
 			time_left -= get_physics_process_delta_time();
 			time_left -= get_physics_process_delta_time();