Skip to content

Commit

Permalink
(ckb) Fix for animations sometimes getting frozen
Browse files Browse the repository at this point in the history
  • Loading branch information
ccMSC committed Apr 25, 2015
1 parent 2b9e664 commit edf84bc
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
beta-v0.1.1
beta-v0.1.2
4 changes: 2 additions & 2 deletions src/ckb/kbanim.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ void KbAnim::save(QSettings& settings){
KbAnim::KbAnim(QObject* parent, const KeyMap& map, const QString& name, const QStringList& keys, const AnimScript* script) :
QObject(parent),
_script(AnimScript::copy(this, script->guid())), _map(map), _keys(keys),
repeatTime(0), kpRepeatTime(0), repeatMsec(0), kpRepeatMsec(0), forceStarted(false),
repeatTime(0), kpRepeatTime(0), stopTime(0), kpStopTime(0), repeatMsec(0), kpRepeatMsec(0), forceStarted(false),
_guid(QUuid::createUuid()), _name(name), _opacity(1.), _mode(Normal), _needsSave(true)
{
if(_script){
Expand All @@ -93,7 +93,7 @@ KbAnim::KbAnim(QObject* parent, const KeyMap& map, const KbAnim& other) :
QObject(parent),
_script(AnimScript::copy(this, other.script()->guid())), _scriptGuid(_script->guid()), _scriptName(_script->name()),
_map(map), _keys(other._keys), _parameters(other._parameters),
repeatTime(0), kpRepeatTime(0), repeatMsec(0), kpRepeatMsec(0), forceStarted(false),
repeatTime(0), kpRepeatTime(0), stopTime(0), kpStopTime(0), repeatMsec(0), kpRepeatMsec(0), forceStarted(false),
_guid(other._guid), _name(other._name), _opacity(other._opacity), _mode(other._mode), _needsSave(true)
{
reInit();
Expand Down

0 comments on commit edf84bc

Please sign in to comment.