aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2010-04-01 11:24:40 +0200
committerGerd Hoffmann <kraxel@redhat.com>2010-04-01 11:24:40 +0200
commite1757de76ecabf37c0ce59ed534b13ec630b3ec6 (patch)
tree8da04c7b3ad84bf863ff6560ff77d7fbaafa8bf0
parent9bbee7df3b13eb0caf1874748038235350916fbd (diff)
v3.85
-rw-r--r--Changes6
-rw-r--r--x11/motv.c12
-rw-r--r--x11/xawtv.c11
-rw-r--r--xawtv.spec2
4 files changed, 17 insertions, 14 deletions
diff --git a/Changes b/Changes
index 89833bf..c23ea0a 100644
--- a/Changes
+++ b/Changes
@@ -2,6 +2,12 @@
3.83 => 3.84
============
+ * fix startup segfault in xawtv + motv.
+
+
+3.83 => 3.84
+============
+
* fixed a number of gcc 3.3 warnings, also did some other cleanups
while being at it.
* Multimedia keyboard support.
diff --git a/x11/motv.c b/x11/motv.c
index 81596c4..1acb8d5 100644
--- a/x11/motv.c
+++ b/x11/motv.c
@@ -1959,13 +1959,11 @@ update_movie_menus(void)
XmStringFree(str);
add_cmd_callback(push,XmNactivateCallback,
"movie","driver",writer->name);
- if (NULL != mov_driver) {
- if (NULL == movie_driver ||
- 0 == strcasecmp(mov_driver,writer->name)) {
- movie_driver = writer;
- i_movie_driver = i;
- XtVaSetValues(driver_option,XmNmenuHistory,push,NULL);
- }
+ if (NULL == movie_driver ||
+ (NULL != mov_driver && 0 == strcasecmp(mov_driver,writer->name))) {
+ movie_driver = writer;
+ i_movie_driver = i;
+ XtVaSetValues(driver_option,XmNmenuHistory,push,NULL);
}
i++;
}
diff --git a/x11/xawtv.c b/x11/xawtv.c
index 313c54d..052d3ef 100644
--- a/x11/xawtv.c
+++ b/x11/xawtv.c
@@ -854,12 +854,11 @@ update_movie_menus(void)
writer = list_entry(item, struct ng_writer, list);
m_movie_driver[i].nr = i;
m_movie_driver[i].str = writer->desc;
- if (NULL != mov_driver)
- if (NULL == movie_driver ||
- 0 == strcasecmp(mov_driver,writer->name)) {
- movie_driver = writer;
- i_movie_driver = i;
- }
+ if (NULL == movie_driver ||
+ (NULL != mov_driver && 0 == strcasecmp(mov_driver,writer->name))) {
+ movie_driver = writer;
+ i_movie_driver = i;
+ }
i++;
}
m_movie_driver[i].nr = i;
diff --git a/xawtv.spec b/xawtv.spec
index 6bf58bd..7efc295 100644
--- a/xawtv.spec
+++ b/xawtv.spec
@@ -1,7 +1,7 @@
Name: xawtv
Group: Applications/Multimedia
Autoreqprov: on
-Version: 3.84
+Version: 3.85
Release: 0
License: GPL
Summary: v4l applications

Privacy Policy