From c7c97178ca4de5c25d1d15e27d135b59cc881a90 Mon Sep 17 00:00:00 2001 From: Jim Evins Date: Tue, 2 Jan 2018 03:32:28 -0500 Subject: [PATCH] Explicitly check QFile::open() return value. --- backends/merge/Text.cpp | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/backends/merge/Text.cpp b/backends/merge/Text.cpp index f1aff8a..be4765b 100644 --- a/backends/merge/Text.cpp +++ b/backends/merge/Text.cpp @@ -78,22 +78,23 @@ namespace glabels /// void Text::open() { - mFile.setFileName( source() ); - mFile.open( QIODevice::ReadOnly|QIODevice::Text ); - mKeys.clear(); mNFieldsMax = 0; - if ( mLine1HasKeys && mFile.isOpen() ) + mFile.setFileName( source() ); + if (mFile.open( QIODevice::ReadOnly|QIODevice::Text )) { - mKeys = parseLine(); - if ( (mKeys.size() == 1) && (mKeys[0] == "") ) + if ( mLine1HasKeys ) { - mKeys.clear(); - } - else - { - mNFieldsMax = mKeys.size(); + mKeys = parseLine(); + if ( (mKeys.size() == 1) && (mKeys[0] == "") ) + { + mKeys.clear(); + } + else + { + mNFieldsMax = mKeys.size(); + } } } }