diff options
| author | Pavel Labath <pavelo@centrum.sk> | 2011-08-21 18:59:03 (GMT) |
|---|---|---|
| committer | Paul Tagliamonte <paultag@fluxbox.org> | 2012-04-07 02:13:14 (GMT) |
| commit | fca1b5bd9a2ec1761b0d9f34e886347d0677fbff (patch) | |
| tree | 424994865aab5be8a4fcdbf74b15a29008cf5ddd /src/FbTk/Resource.hh | |
| parent | f09047eb71d2d9108efa912a2123066c4bc04ae0 (diff) | |
| download | fluxbox_paul-fca1b5bd9a2ec1761b0d9f34e886347d0677fbff.zip fluxbox_paul-fca1b5bd9a2ec1761b0d9f34e886347d0677fbff.tar.bz2 | |
Don't spam with the "Unable to convert ... from nil" messages
Diffstat (limited to 'src/FbTk/Resource.hh')
| -rw-r--r-- | src/FbTk/Resource.hh | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/FbTk/Resource.hh b/src/FbTk/Resource.hh index b729ad4..e3e8cc1 100644 --- a/src/FbTk/Resource.hh +++ b/src/FbTk/Resource.hh | |||
| @@ -257,9 +257,13 @@ public: | |||
| 257 | 257 | ||
| 258 | virtual void setFromLua(lua::state &l) { | 258 | virtual void setFromLua(lua::state &l) { |
| 259 | try { | 259 | try { |
| 260 | m_value = Traits::fromLua(l); | 260 | if(l.isnil(-1)) |
| 261 | m_rm->resourceChanged(*this); | 261 | setDefaultValue(); |
| 262 | m_modified_sig.emit(m_value); | 262 | else { |
| 263 | m_value = Traits::fromLua(l); | ||
| 264 | m_rm->resourceChanged(*this); | ||
| 265 | m_modified_sig.emit(m_value); | ||
| 266 | } | ||
| 263 | } | 267 | } |
| 264 | catch(ConversionError &e) { | 268 | catch(ConversionError &e) { |
| 265 | std::cerr << name() << ": " << e.what() << std::endl; | 269 | std::cerr << name() << ": " << e.what() << std::endl; |