summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorViljami Ilola <+@hix.fi>2024-04-27 02:20:46 +0300
committerViljami Ilola <+@hix.fi>2024-04-27 02:20:46 +0300
commitd73fe4bb20e544443476ebb4c9fc593fa0a8ad4a (patch)
tree9a0669819d4f18cf1a118f0755d78dd95959dc7c /src
parentdb5967a52d9409842581276154a6fa9763a57a24 (diff)
fix tests
Diffstat (limited to 'src')
-rw-r--r--src/sliceitoff/settings/settings.py6
-rw-r--r--src/sliceitoff/sfx/sfx.py3
2 files changed, 6 insertions, 3 deletions
diff --git a/src/sliceitoff/settings/settings.py b/src/sliceitoff/settings/settings.py
index 19cca7d..2d4b28f 100644
--- a/src/sliceitoff/settings/settings.py
+++ b/src/sliceitoff/settings/settings.py
@@ -3,12 +3,14 @@ import os
from pathlib import Path
from .static import DEFAULT_SETTINGS
+TEST_CONFIG_FILE = os.getenv("TEST_CONFIG_FILE")
+
class Settings:
""" Handles loading and saving settings from config file"""
def __init__(self, filename = None):
self.settings=[]
- if filename:
- self.config_filename = filename
+ if TEST_CONFIG_FILE:
+ self.config_filename = Path(TEST_CONFIG_FILE)
else:
if os.name == 'nt':
self.config_filename = (Path.home().resolve()
diff --git a/src/sliceitoff/sfx/sfx.py b/src/sliceitoff/sfx/sfx.py
index 8f3371e..a72df0b 100644
--- a/src/sliceitoff/sfx/sfx.py
+++ b/src/sliceitoff/sfx/sfx.py
@@ -52,7 +52,8 @@ class Sfx:
self.music_volume += 1
self.music_volume %= 11
settings.replace_value("music_volume", self.music_volume)
- self.sound[self.bgm].set_volume(self.music_volume / 10)
+ if self.bgm:
+ self.sound[self.bgm].set_volume(self.music_volume / 10)
def play(self, sample):
""" Just plays named sample loaded from assets directory """