diff options
| author | Bent Bisballe Nyeng <deva@aasimon.org> | 2015-05-22 10:39:49 +0200 |
|---|---|---|
| committer | Bent Bisballe Nyeng <deva@aasimon.org> | 2015-05-22 10:39:49 +0200 |
| commit | 158838f9b52d21610626f55964170a3e82f6ccdb (patch) | |
| tree | 0dee778483d667209aca5f2a0a09d9f0c213bca0 /src/drumkitparser.cc | |
| parent | bef1d5542f926a3b942374707dd56041013d35ff (diff) | |
| parent | 2699cb7d324ffb1d2adc62e1f62434397aa39e2d (diff) | |
Merge with master
Diffstat (limited to 'src/drumkitparser.cc')
| -rw-r--r-- | src/drumkitparser.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/drumkitparser.cc b/src/drumkitparser.cc index 00232b2..f7bfe40 100644 --- a/src/drumkitparser.cc +++ b/src/drumkitparser.cc @@ -38,12 +38,14 @@ DrumKitParser::DrumKitParser(const std::string &file, DrumKit &k) : kit(k) , refs(REFSFILE) { - refs.load(); - std::string kitfile = file; - if(file.size() > 1 && file[0] == '@') { - kitfile = refs.getValue(file.substr(1)); + if(refs.load()) { + if(file.size() > 1 && file[0] == '@') { + kitfile = refs.getValue(file.substr(1)); + } + } else { + ERR(drumkitparser, "Error reading refs.conf"); } // instr = NULL; |