Skip to content

Commit 8f442c5

Browse files
Fix for glsl threading crash #97 2/?
1 parent db1a225 commit 8f442c5

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

src/libprojectM/projectM.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ void projectM::readConfig (const std::string & configFile )
228228

229229
_settings.easterEgg = config.read<float> ( "Easter Egg Parameter", 0.0);
230230
_settings.softCutRatingsEnabled =
231-
config.read<float> ( "Soft Cut Ratings Enabled", false);
231+
config.read<bool> ( "Soft Cut Ratings Enabled", false);
232232

233233
projectM_init ( _settings.meshX, _settings.meshY, _settings.fps,
234234
_settings.textureSize, _settings.windowWidth,_settings.windowHeight);

src/libprojectM/projectM.hpp

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,21 @@ class DLLEXPORT projectM
135135
float easterEgg;
136136
bool shuffleEnabled;
137137
bool softCutRatingsEnabled;
138+
139+
Settings() :
140+
meshX(32),
141+
meshY(24),
142+
fps(35),
143+
textureSize(512),
144+
windowWidth(512),
145+
windowHeight(512),
146+
smoothPresetDuration(10),
147+
presetDuration(15),
148+
beatSensitivity(10.0),
149+
aspectCorrection(true),
150+
easterEgg(0.0),
151+
shuffleEnabled(true),
152+
softCutRatingsEnabled(false) {}
138153
};
139154

140155
projectM(std::string config_file, int flags = FLAG_NONE);

0 commit comments

Comments
 (0)