projects
/
goodguy
/
history.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
bd0694f
)
repair for svg segv, fix valgrind free ref err
author
Good Guy
<good1.2guy@gmail.com>
Thu, 29 Mar 2018 14:32:55 +0000
(08:32 -0600)
committer
Good Guy
<good1.2guy@gmail.com>
Thu, 29 Mar 2018 14:32:55 +0000
(08:32 -0600)
cinelerra-5.1/plugins/svg/svgwin.C
patch
|
blob
|
history
diff --git
a/cinelerra-5.1/plugins/svg/svgwin.C
b/cinelerra-5.1/plugins/svg/svgwin.C
index d4011954ec7413df74d2d8fbd67d2f96b9077eb5..028a9307772c470aa2645bcf02f72064bda947ba 100644
(file)
--- a/
cinelerra-5.1/plugins/svg/svgwin.C
+++ b/
cinelerra-5.1/plugins/svg/svgwin.C
@@
-213,14
+213,13
@@
void NewSvgButton::run()
new_window->update_filter("*.svg");
result = new_window->run_window();
const char *filepath = new_window->get_path(0);
new_window->update_filter("*.svg");
result = new_window->run_window();
const char *filepath = new_window->get_path(0);
- strcpy(filename, filepath);
+ strcpy(filename, filepath
? filepath : ""
);
delete new_window; new_window = 0;
delete new_window; new_window = 0;
- if( result || !filepath || !*filepath ) {
- window->editing_lock.lock();
+ window->editing_lock.lock();
+ if( result || !filename[0] )
window->editing = 0;
window->editing = 0;
- window->editing_lock.unlock();
- return; // cancel or no filename given
- }
+ window->editing_lock.unlock();
+ if( !window->editing ) return; // cancel or no filename given
// Extend the filename with .svg
if( strlen(filename) < 4 ||
// Extend the filename with .svg
if( strlen(filename) < 4 ||
@@
-398,7
+397,7
@@
void SvgInkscapeThread::run()
"inkscape --with-gui %s", edit->client->config.svg_file);
printf(_("Running external SVG editor: %s\n"), command);
char *const argv[] = {
"inkscape --with-gui %s", edit->client->config.svg_file);
printf(_("Running external SVG editor: %s\n"), command);
char *const argv[] = {
- (char*) "in
c
scape",
+ (char*) "in
k
scape",
(char*)"--with-gui",
edit->client->config.svg_file,
0,
(char*)"--with-gui",
edit->client->config.svg_file,
0,