Cleaning up variant copying in getAttribute for IE

quehanwei · Oct 10, 2018 · 65364c5 · 65364c5
1 parent b46c7bd
commit 65364c5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/cpp/iedriver/CommandHandlers/SendKeysCommandHandler.cpp b/cpp/iedriver/CommandHandlers/SendKeysCommandHandler.cpp
@@ -238,8 +238,7 @@ bool SendKeysCommandHandler::HasMultipleAttribute(ElementHandle element_wrapper)
                                                        &multiple_value);
   if (status_code == WD_SUCCESS &&
       VariantUtilities::VariantIsString(multiple_value)) {
-    std::wstring value(multiple_value.bstrVal);
-    if (value == L"true") {
+    if (multiple_value.bstrVal == L"true") {
       allows_multiple = true;
     }
   }

diff --git a/cpp/iedriver/Element.cpp b/cpp/iedriver/Element.cpp
@@ -566,7 +566,7 @@ int Element::GetAttributeValue(const std::string& attribute_name,
   status_code = script_wrapper.Execute();
 
   if (status_code == WD_SUCCESS) {
-    *attribute_value = script_wrapper.result();
+    ::VariantCopy(attribute_value, &script_wrapper.result());
   } else {
     LOG(WARN) << "Failed to determine element attribute";
   }