oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clipboard: vector size only calculated once.

Browse Source 
transition: check of t pointer inside the check
sourcescommon: logical expression simplified.
This commit is contained in:
Carmot
2019-01-11 11:51:24 +01:00
parent ee019517b1
commit 652ac72c1c
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
project/sourcescommon.cpp
+1 -1
View File
@@ -205,7 +205,7 @@ void SourcesCommon::dropEvent(QWidget* parent, QDropEvent *event, const QModelIn
// dragging files within project
// if we dragged to the root OR dragged to a folder
if (!drop_item.isValid() || (drop_item.isValid() && m->get_type() == MEDIA_TYPE_FOLDER)) {
if (!drop_item.isValid() || m->get_type() == MEDIA_TYPE_FOLDER) {
QVector<Media*> move_items;
for (int i=0;i<items.size();i++) {
const QModelIndex& item = items.at(i);
project/transition.cpp
+1 -1
View File
@@ -81,8 +81,8 @@ Transition* get_transition_from_meta(Clip* c, Clip* s, const EffectMeta* em) {
int create_transition(Clip* c, Clip* s, const EffectMeta* em, long length) {
Transition* t = get_transition_from_meta(c, s, em);
if (length >= 0) t->set_length(length);
if (t != NULL) {
if (length >= 0) t->set_length(length);
QVector<Transition*>& transition_list = (c->sequence == NULL) ? clipboard_transitions : c->sequence->transitions;
transition_list.append(t);
return transition_list.size() - 1;