[SCM] lives/master: debian/patches/99-reload_osc.patch

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 17658a83fb5b41cb4aea152e12205851acc20e02
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Mar 11 14:31:38 2014 +0000

    debian/patches/99-reload_osc.patch
    
    - Prevent crash when reloading OSC devices.

diff --git a/debian/patches/99-reload_osc.patch b/debian/patches/99-reload_osc.patch
new file mode 100644
index 0000000..fa85728
--- /dev/null
+++ b/debian/patches/99-reload_osc.patch
@@ -0,0 +1,77 @@
+Description: Prevent crash when reloading OSC devices.
+Origin: upstream, commit:2028
+---
+ src/omc-learn.c |   36 ++++++++++++++++++++++++++----------
+ 1 file changed, 26 insertions(+), 10 deletions(-)
+
+--- lives.orig/src/omc-learn.c
++++ lives/src/omc-learn.c
+@@ -2420,16 +2420,26 @@ OSCbuf *omc_learner_decode(gint type, gi
+ 
+ 
+ void on_midi_save_activate (GtkMenuItem *menuitem, gpointer user_data) {
+-  gchar *save_file=choose_file(NULL,NULL,NULL,LIVES_FILE_CHOOSER_ACTION_SAVE,NULL,NULL);
+-  int fd;
+   GSList *slist=omc_node_list;
++
+   size_t srchlen;
++
+   lives_omc_match_node_t *mnode;
+   lives_omc_macro_t omacro;
++
++  gchar *msg;
++  gchar *save_file;
++
+   int nnodes;
+-  int i;
+   int retval;
+-  gchar *msg;
++
++  int fd;
++
++  register int i;
++
++  save_file=choose_file(NULL,NULL,NULL,LIVES_FILE_CHOOSER_ACTION_SAVE,NULL,NULL);
++
++  if (save_file==NULL||!strlen(save_file)) return;
+ 
+   msg=g_strdup_printf(_("Saving device mapping to file %s..."),save_file);
+   d_print(msg);
+@@ -2532,17 +2542,23 @@ static void do_midi_version_error(const
+ 
+ 
+ void on_midi_load_activate (GtkMenuItem *menuitem, gpointer user_data) {
+-  gchar *load_file=NULL;
+-  int fd;
+-  ssize_t bytes;
+-  ssize_t srchlen;
+   lives_omc_match_node_t *mnode;
+   lives_omc_macro_t omacro;
++
++  ssize_t bytes;
++
+   gchar tstring[512];
+-  int nnodes,i,macro,nvars,supertype,j,idx=-1;
++
++  gchar *load_file=NULL;
+   gchar *srch;
+   gchar *msg;
+ 
++  uint32_t srchlen,nnodes,macro,nvars,supertype;
++  int idx=-1;
++  int fd;
++
++  register int i,j;
++
+ #ifdef OMC_MIDI_IMPL
+   size_t blen;
+   gchar *tmp;
+@@ -2551,7 +2567,7 @@ void on_midi_load_activate (GtkMenuItem
+   if (user_data==NULL) load_file=choose_file(NULL,NULL,NULL,LIVES_FILE_CHOOSER_ACTION_OPEN,NULL,NULL);
+   else load_file=g_strdup((gchar *)user_data);
+ 
+-  if (load_file==NULL) return;
++  if (load_file==NULL||!strlen(load_file)) return;
+ 
+   msg=g_strdup_printf(_("Loading device mapping from file %s..."),load_file);
+   d_print(msg);
diff --git a/debian/patches/series b/debian/patches/series
index 8e7a27f..0571854 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01-cdda2wav_to_icedax.patch
 02-drop_py3_multiencoder.patch
 99-workaround_av_find_stream_info.patch
+99-reload_osc.patch

-- 
lives packaging