[Gnash-commit] gnash ChangeLog gui/gnash.cpp

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/03/15 21:46:20

Modified files:
        .              : ChangeLog 
        gui            : gnash.cpp 

Log message:
                * gui/gnash.cpp: mend url. Fixes bug #22609.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5935&r2=1.5936
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gnash.cpp?cvsroot=gnash&r1=1.109&r2=1.110

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5935
retrieving revision 1.5936
diff -u -b -r1.5935 -r1.5936
--- ChangeLog   15 Mar 2008 18:37:07 -0000      1.5935
+++ ChangeLog   15 Mar 2008 21:46:19 -0000      1.5936
@@ -1,3 +1,7 @@
+2008-03-15 Benjamin Wolsey <address@hidden>
+
+       * gui/gnash.cpp: mend url. Fixes bug #22609.
+
 2008-03-15 Sandro Santilli <address@hidden>
 
        * server/swf_function.cpp: don't put 'this' into a register if

Index: gui/gnash.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gnash.cpp,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -b -r1.109 -r1.110
--- gui/gnash.cpp       15 Mar 2008 11:33:41 -0000      1.109
+++ gui/gnash.cpp       15 Mar 2008 21:46:20 -0000      1.110
@@ -62,7 +62,7 @@
 using std::cout;
 
 std::vector<std::string> infiles;
-const char* url = NULL;
+std::string url = "";
 
 namespace {
 gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
@@ -270,8 +270,8 @@
                     player.setDelay( parser.argument<long>(i) );
                     break;
                 case 'u':
-                    url = parser.argument(i).c_str();
-                    log_debug (_("Setting root URL to %s"), url);
+                    url = parser.argument(i);
+                    log_debug (_("Setting root URL to %s"), url.c_str());
                     break;
                 case 'U':      // Set base URL
                     player.setBaseUrl(parser.argument(i));
@@ -436,5 +436,5 @@
            return EXIT_FAILURE;
        }
 
-       return player.run(argc, argv, infiles.front().c_str(), url);
+       return player.run(argc, argv, infiles.front().c_str(), url.c_str());
 }