From 2b98447b41fba747cd090e5e7298407943a165bc Mon Sep 17 00:00:00 2001
From: Altaezio <v.robert.jaunet@gmail.com>
Date: Mon, 20 Jul 2026 18:13:47 +0200
Subject: [PATCH] =?UTF-8?q?Ferme=20les=20fen=C3=AAtres=20(des=20param?=
 =?UTF-8?q?=C3=A8tres)=20sans=20mettre=20pause?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/game_data/scripts/settings_data.gd | 1 +
 common/game_info/game_info.gd             | 2 +-
 gui/menu/window/scripts/window.gd         | 4 ++++
 gui/pause/scripts/pause.gd                | 7 ++++++-
 translation/game/gui.csv                  | 1 +
 5 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/common/game_data/scripts/settings_data.gd b/common/game_data/scripts/settings_data.gd
index 22ed73c..b0a87a3 100644
--- a/common/game_data/scripts/settings_data.gd
+++ b/common/game_data/scripts/settings_data.gd
@@ -1,6 +1,7 @@
 extends Resource
 class_name SettingsData
 
+const MASTER_BUS_ID = 0
 const MUSIC_BUS_ID = 1
 const SFX_BUS_ID = 2
 const AMBIANCE_BUS_ID = 3
diff --git a/common/game_info/game_info.gd b/common/game_info/game_info.gd
index 5470524..bc710b9 100644
--- a/common/game_info/game_info.gd
+++ b/common/game_info/game_info.gd
@@ -92,7 +92,7 @@ func _on_settings_language_changed(s : SettingsData):
     update_language_settings(s)
 
 func _on_settings_sound_changed(s : SettingsData):
-    AudioServer.set_bus_volume_db(0, linear_to_db(s.master_volume))
+    AudioServer.set_bus_volume_db(SettingsData.MASTER_BUS_ID, linear_to_db(s.master_volume))
     AudioServer.set_bus_volume_db(SettingsData.MUSIC_BUS_ID, linear_to_db(s.music_volume))
     AudioServer.set_bus_volume_db(SettingsData.SFX_BUS_ID, linear_to_db(s.sfx_volume))
     AudioServer.set_bus_volume_db(SettingsData.AMBIANCE_BUS_ID, linear_to_db(s.ambiance_volume))
diff --git a/gui/menu/window/scripts/window.gd b/gui/menu/window/scripts/window.gd
index 9b7d808..9b08697 100644
--- a/gui/menu/window/scripts/window.gd
+++ b/gui/menu/window/scripts/window.gd
@@ -11,6 +11,10 @@ signal closed
 func _ready():
 	update_title(title)
 
+func _input(_event: InputEvent) -> void:
+	if is_visible_in_tree() and Input.is_action_just_pressed("pause"):
+		close_window()
+
 func update_title(text : String):
 	title = text
 	if (is_node_ready()):
diff --git a/gui/pause/scripts/pause.gd b/gui/pause/scripts/pause.gd
index 2f50366..f8a7810 100644
--- a/gui/pause/scripts/pause.gd
+++ b/gui/pause/scripts/pause.gd
@@ -32,7 +32,12 @@ func set_pause(p):
         GameInfo.save_settings()
 
 func _input(_event):
-    if Input.is_action_just_pressed("pause"):
+    if (SceneManager.actual_scene
+        and SceneManager.actual_scene.get_scene_id() != "TITLE"
+        and Input.is_action_just_pressed("pause")
+        and not %Settings.is_visible_in_tree()
+        and not %Controls.is_visible_in_tree()
+    ):
         pause = not pause
 
 func _on_timeline_ended():
diff --git a/translation/game/gui.csv b/translation/game/gui.csv
index 52f9fd9..455c56a 100644
--- a/translation/game/gui.csv
+++ b/translation/game/gui.csv
@@ -210,6 +210,7 @@ NO_ENERGY_LEFT," (no energy left)", " (pas d'énergie restante)"
 SETTINGS,Settings,Paramètres
 LANGUAGE,Language,Langage
 SOUND,Sound,Son
+MASTER_VOLUME,Master volume,Volume principal
 MUSIC_VOLUME,Music volume,Volume de la musique
 ENVIRONMENT_VOLUME,Environment Volume,Volume de l'environnement
 SFX_VOLUME,Sfx Volume,Volume des bruitages