Skip to content

Commit

Permalink
Fix some warnings and test failures on nightlies
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Jan 14, 2016
1 parent f5373ac commit c452c3d
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/qgis/Merge.py
Expand Up @@ -84,7 +84,7 @@ def processAlgorithm(self, progress):
total = 100.0 / float(totalFeatureCount)
writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
fields.toList(), layers[0].dataProvider().geometryType(),
layers[0].crs())
layers[0].crs())

featureCount = 0
for layer in layers:
Expand Down
2 changes: 1 addition & 1 deletion src/app/main.cpp
Expand Up @@ -307,7 +307,7 @@ void qgisCrash( int signal )
if ( gdbpid == 0 )
{
// attach, backtrace and continue
execl( "/usr/bin/gdb", "gdb", "-q", "-batch", "-n", pidstr, "-ex", "thread", "-ex", "bt full", exename, nullptr );
execl( "/usr/bin/gdb", "gdb", "-q", "-batch", "-n", pidstr, "-ex", "thread", "-ex", "bt full", exename, NULL );
perror( "cannot exec gdb" );
exit( 1 );
}
Expand Down
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit c452c3d

Please sign in to comment.